Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ charset-normalizer==3.4.7
# via requests
click==8.3.3
# via edx-django-utils
cryptography==46.0.7
cryptography==47.0.0
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that openedx-platform is at cryptography==45.0.7

Do you know if having different versions here cause any issue here? I'm not sure what's the best practice here @bmtcril @mariajgrimaldi

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch, thanks for checking! This is a bit of a rabbit hole, but the short version is that it should be ok. We don't include the pinned versions of packages in our setup_requires: https://github.com/openedx/openedx-authz/blob/main/setup.py#L145 to get around things like this. If there's a conflict it will show up in the edx-platform tests when our next version of openedx-authz gets pulled in.

The longer version is that the pin in edx-platform probably shouldn't even exist anymore. There is a chain of pinned dependencies that needs to be resolved. I'll see if I can get the team that added that pin to remove it and do the associated upgrades. https://github.com/openedx/edx-platform/blob/66191a93a7c4d6948a8ab3c6f24ac5518f27cdc3/requirements/constraints.txt#L136-L137

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fwiw it looks like we're close to merging the cryptograpy upgrade in platform too:

openedx/openedx-platform#38465

# via pyjwt
django==5.2.13
# via
Expand Down Expand Up @@ -94,7 +94,7 @@ edx-opaque-keys[django]==4.0.0
# openedx-events
edx-organizations==8.0.0
# via -r requirements/base.in
fastavro==1.12.1
fastavro==1.12.2
# via openedx-events
idna==3.13
# via requests
Expand All @@ -104,7 +104,7 @@ openedx-atlas==0.7.0
# via -r requirements/base.in
openedx-events==11.2.0
# via -r requirements/base.in
packaging==26.1
packaging==26.2
# via drf-yasg
pillow==12.2.0
# via edx-organizations
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ filelock==3.29.0
# python-discovery
# tox
# virtualenv
packaging==26.1
packaging==26.2
# via
# pyproject-api
# tox
Expand Down
10 changes: 5 additions & 5 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bracex==2.6
# via
# -r requirements/quality.txt
# wcmatch
build==1.4.3
build==1.4.4
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down Expand Up @@ -71,7 +71,7 @@ coverage[toml]==7.13.5
# via
# -r requirements/quality.txt
# pytest-cov
cryptography==46.0.7
cryptography==47.0.0
# via
# -r requirements/quality.txt
# pyjwt
Expand Down Expand Up @@ -170,7 +170,7 @@ edx-opaque-keys[django]==4.0.0
# openedx-events
edx-organizations==8.0.0
# via -r requirements/quality.txt
fastavro==1.12.1
fastavro==1.12.2
# via
# -r requirements/quality.txt
# openedx-events
Expand Down Expand Up @@ -219,7 +219,7 @@ openedx-atlas==0.7.0
# via -r requirements/quality.txt
openedx-events==11.2.0
# via -r requirements/quality.txt
packaging==26.1
packaging==26.2
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand Down Expand Up @@ -349,7 +349,7 @@ requests==2.33.1
# via
# -r requirements/quality.txt
# edx-drf-extensions
ruff==0.15.11
ruff==0.15.12
# via -r requirements/quality.txt
semantic-version==2.10.0
# via
Expand Down
10 changes: 5 additions & 5 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ bracex==2.6
# via
# -r requirements/test.txt
# wcmatch
build==1.4.3
build==1.4.4
# via -r requirements/doc.in
casbin-django-orm-adapter==1.7.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -54,7 +54,7 @@ coverage[toml]==7.13.5
# via
# -r requirements/test.txt
# pytest-cov
cryptography==46.0.7
cryptography==47.0.0
# via
# -r requirements/test.txt
# pyjwt
Expand Down Expand Up @@ -148,7 +148,7 @@ edx-opaque-keys[django]==4.0.0
# openedx-events
edx-organizations==8.0.0
# via -r requirements/test.txt
fastavro==1.12.1
fastavro==1.12.2
# via
# -r requirements/test.txt
# openedx-events
Expand Down Expand Up @@ -197,13 +197,13 @@ more-itertools==11.0.2
# via
# jaraco-classes
# jaraco-functools
nh3==0.3.4
nh3==0.3.5
# via readme-renderer
openedx-atlas==0.7.0
# via -r requirements/test.txt
openedx-events==11.2.0
# via -r requirements/test.txt
packaging==26.1
packaging==26.2
# via
# -r requirements/test.txt
# build
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
build==1.4.3
build==1.4.4
# via pip-tools
click==8.3.3
# via pip-tools
packaging==26.1
packaging==26.2
# via
# build
# wheel
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# make upgrade
#
packaging==26.1
packaging==26.2
# via wheel
wheel==0.47.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==26.0.1
pip==26.1
# via -r requirements/pip.in
setuptools==82.0.1
# via -r requirements/pip.in
8 changes: 4 additions & 4 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ coverage[toml]==7.13.5
# via
# -r requirements/test.txt
# pytest-cov
cryptography==46.0.7
cryptography==47.0.0
# via
# -r requirements/test.txt
# pyjwt
Expand Down Expand Up @@ -140,7 +140,7 @@ edx-opaque-keys[django]==4.0.0
# openedx-events
edx-organizations==8.0.0
# via -r requirements/test.txt
fastavro==1.12.1
fastavro==1.12.2
# via
# -r requirements/test.txt
# openedx-events
Expand Down Expand Up @@ -172,7 +172,7 @@ openedx-atlas==0.7.0
# via -r requirements/test.txt
openedx-events==11.2.0
# via -r requirements/test.txt
packaging==26.1
packaging==26.2
# via
# -r requirements/test.txt
# drf-yasg
Expand Down Expand Up @@ -259,7 +259,7 @@ requests==2.33.1
# via
# -r requirements/test.txt
# edx-drf-extensions
ruff==0.15.11
ruff==0.15.12
# via -r requirements/quality.in
semantic-version==2.10.0
# via
Expand Down
6 changes: 3 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ code-annotations==3.0.0
# via -r requirements/test.in
coverage[toml]==7.13.5
# via pytest-cov
cryptography==46.0.7
cryptography==47.0.0
# via
# -r requirements/base.txt
# pyjwt
Expand Down Expand Up @@ -123,7 +123,7 @@ edx-opaque-keys[django]==4.0.0
# openedx-events
edx-organizations==8.0.0
# via -r requirements/base.txt
fastavro==1.12.1
fastavro==1.12.2
# via
# -r requirements/base.txt
# openedx-events
Expand All @@ -145,7 +145,7 @@ openedx-atlas==0.7.0
# via -r requirements/base.txt
openedx-events==11.2.0
# via -r requirements/base.txt
packaging==26.1
packaging==26.2
# via
# -r requirements/base.txt
# drf-yasg
Expand Down