Skip to content

Commit

Permalink
Merge pull request #490 from openedx/jenkins/upgrade-python-requireme…
Browse files Browse the repository at this point in the history
…nts-9b7f944

Python Requirements Update
  • Loading branch information
DawoudSheraz authored Mar 15, 2024
2 parents 9b7f944 + 5de7aa6 commit 24e0204
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 34 deletions.
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ filelock==3.13.1
# virtualenv
idna==3.6
# via requests
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand Down
9 changes: 9 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,12 @@ elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
19 changes: 10 additions & 9 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ click==8.1.7
# uvicorn
click-log==0.4.0
# via edx-lint
code-annotations==1.6.0
code-annotations==1.7.0
# via
# edx-lint
# edx-toggles
Expand Down Expand Up @@ -139,11 +139,12 @@ idna==3.6
# anyio
# requests
# yarl
importlib-metadata==7.0.2
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# keyring
# twine
importlib-resources==6.1.3
importlib-resources==6.3.0
# via keyring
iniconfig==2.0.0
# via pytest
Expand Down Expand Up @@ -179,11 +180,11 @@ more-itertools==10.2.0
# via jaraco-classes
multidict==6.0.5
# via yarl
newrelic==9.7.0
newrelic==9.7.1
# via edx-django-utils
nh3==0.2.15
# via readme-renderer
packaging==23.2
packaging==24.0
# via
# pyproject-api
# pytest
Expand Down Expand Up @@ -214,7 +215,7 @@ pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
# via cffi
pydantic==2.6.3
pydantic==2.6.4
# via fastapi
pydantic-core==2.16.3
# via pydantic
Expand Down Expand Up @@ -251,7 +252,7 @@ pyproject-api==1.6.1
# via tox
pysrt==1.1.2
# via -r requirements/base.in
pytest==8.0.2
pytest==8.1.1
# via
# pytest-cov
# pytest-django
Expand Down Expand Up @@ -344,13 +345,13 @@ urllib3==2.2.1
# requests
# responses
# twine
uvicorn==0.27.1
uvicorn==0.28.0
# via pact-python
virtualenv==20.25.1
# via tox
yarl==1.9.4
# via pact-python
zipp==3.17.0
zipp==3.18.1
# via
# importlib-metadata
# importlib-resources
Expand Down
12 changes: 7 additions & 5 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ build==1.1.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.2
# via build
packaging==23.2
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
packaging==24.0
# via build
pip-tools==7.4.1
# via -r requirements/pip-tools.in
Expand All @@ -23,9 +25,9 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.42.0
wheel==0.43.0
# via pip-tools
zipp==3.17.0
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.42.0
wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.1.1
setuptools==69.2.0
# via -r requirements/pip.in
21 changes: 11 additions & 10 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ click==8.1.7
# uvicorn
click-log==0.4.0
# via edx-lint
code-annotations==1.6.0
code-annotations==1.7.0
# via
# edx-lint
# edx-toggles
coverage[toml]==7.4.3
coverage[toml]==7.4.4
# via
# -r requirements/test.in
# pytest-cov
Expand Down Expand Up @@ -119,11 +119,12 @@ idna==3.6
# anyio
# requests
# yarl
importlib-metadata==7.0.2
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# keyring
# twine
importlib-resources==6.1.3
importlib-resources==6.3.0
# via keyring
iniconfig==2.0.0
# via pytest
Expand Down Expand Up @@ -157,11 +158,11 @@ more-itertools==10.2.0
# via jaraco-classes
multidict==6.0.5
# via yarl
newrelic==9.7.0
newrelic==9.7.1
# via edx-django-utils
nh3==0.2.15
# via readme-renderer
packaging==23.2
packaging==24.0
# via pytest
pact-python==2.1.3
# via -r requirements/test.in
Expand All @@ -183,7 +184,7 @@ pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
# via cffi
pydantic==2.6.3
pydantic==2.6.4
# via fastapi
pydantic-core==2.16.3
# via pydantic
Expand Down Expand Up @@ -217,7 +218,7 @@ pynacl==1.5.0
# via edx-django-utils
pysrt==1.1.2
# via -r requirements/base.in
pytest==8.0.2
pytest==8.1.1
# via
# pytest-cov
# pytest-django
Expand Down Expand Up @@ -305,11 +306,11 @@ urllib3==2.2.1
# requests
# responses
# twine
uvicorn==0.27.1
uvicorn==0.28.0
# via pact-python
yarl==1.9.4
# via pact-python
zipp==3.17.0
zipp==3.18.1
# via
# importlib-metadata
# importlib-resources
Expand Down
14 changes: 7 additions & 7 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ click==8.1.7
# edx-django-utils
# pact-python
# uvicorn
code-annotations==1.6.0
code-annotations==1.7.0
# via edx-toggles
coverage[toml]==7.4.3
coverage[toml]==7.4.4
# via
# -r requirements/test.in
# pytest-cov
Expand Down Expand Up @@ -112,9 +112,9 @@ mock==5.1.0
# via -r requirements/test.in
multidict==6.0.5
# via yarl
newrelic==9.7.0
newrelic==9.7.1
# via edx-django-utils
packaging==23.2
packaging==24.0
# via pytest
pact-python==2.1.3
# via -r requirements/test.in
Expand All @@ -130,7 +130,7 @@ psutil==5.9.8
# pact-python
pycparser==2.21
# via cffi
pydantic==2.6.3
pydantic==2.6.4
# via fastapi
pydantic-core==2.16.3
# via pydantic
Expand All @@ -144,7 +144,7 @@ pynacl==1.5.0
# via edx-django-utils
pysrt==1.1.2
# via -r requirements/base.in
pytest==8.0.2
pytest==8.1.1
# via
# pytest-cov
# pytest-django
Expand Down Expand Up @@ -208,7 +208,7 @@ urllib3==2.2.1
# via
# requests
# responses
uvicorn==0.27.1
uvicorn==0.28.0
# via pact-python
yarl==1.9.4
# via pact-python
Expand Down

0 comments on commit 24e0204

Please sign in to comment.