Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
awais786 authored Mar 31, 2024
2 parents 33ed1a3 + 1cf0017 commit 1df1f55
Show file tree
Hide file tree
Showing 10 changed files with 181 additions and 134 deletions.
29 changes: 17 additions & 12 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
#
amqp==5.2.0
# via kombu
asgiref==3.7.2
asgiref==3.8.1
# via django
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# celery
# django
# djangorestframework
# kombu
billiard==4.2.0
# via celery
Expand All @@ -29,14 +30,15 @@ click==8.1.7
# click-plugins
# click-repl
# edx-django-utils
click-didyoumean==0.3.0
click-didyoumean==0.3.1
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
django==4.2.10
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
# django-crum
# django-model-utils
Expand All @@ -55,32 +57,30 @@ django-model-utils==4.4.0
# edx-celeryutils
django-waffle==4.1.0
# via edx-django-utils
djangorestframework==3.14.0
djangorestframework==3.15.1
# via -r requirements/base.in
edx-celeryutils==1.2.5
# via -r requirements/base.in
edx-django-utils==5.10.1
edx-django-utils==5.12.0
# via -r requirements/base.in
jsonfield==3.1.0
# via edx-celeryutils
kombu==5.3.5
kombu==5.3.6
# via celery
newrelic==9.7.0
newrelic==9.8.0
# via edx-django-utils
pbr==6.0.0
# via stevedore
prompt-toolkit==3.0.43
# via click-repl
psutil==5.9.8
# via edx-django-utils
pycparser==2.21
pycparser==2.22
# via cffi
pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via celery
pytz==2024.1
# via djangorestframework
simplejson==3.19.2
# via -r requirements/base.in
six==1.16.0
Expand All @@ -89,7 +89,7 @@ sqlparse==0.4.4
# via django
stevedore==5.2.0
# via edx-django-utils
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# asgiref
# kombu
Expand All @@ -104,3 +104,8 @@ vine==5.1.0
# kombu
wcwidth==0.2.13
# via prompt-toolkit
wheel==0.43.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
# setuptools
4 changes: 2 additions & 2 deletions requirements/celery53.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ amqp==5.2.0
billiard==4.2.0
celery==5.3.6
click==8.1.7
click-didyoumean==0.3.0
click-didyoumean==0.3.1
click-repl==0.3.0
kombu==5.3.5
kombu==5.3.6
prompt-toolkit==3.0.43
vine==5.1.0
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand All @@ -32,7 +32,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
tox==4.14.2
# via -r requirements/ci.in
virtualenv==20.25.1
# via tox
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,20 @@


# using LTS django version

Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
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
70 changes: 37 additions & 33 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ amqp==5.2.0
# via
# -r requirements/quality.txt
# kombu
asgiref==3.7.2
asgiref==3.8.1
# via
# -r requirements/quality.txt
# django
astroid==3.0.3
astroid==3.1.0
# via
# -r requirements/quality.txt
# pylint
Expand All @@ -23,16 +23,17 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# -r requirements/quality.txt
# celery
# django
# djangorestframework
# kombu
billiard==4.2.0
# via
# -r requirements/quality.txt
# celery
build==1.0.3
build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.3.2
cachetools==5.3.3
# via
# -r requirements/ci.txt
# tox
Expand Down Expand Up @@ -63,7 +64,7 @@ click==8.1.7
# edx-django-utils
# edx-lint
# pip-tools
click-didyoumean==0.3.0
click-didyoumean==0.3.1
# via
# -r requirements/quality.txt
# celery
Expand All @@ -79,19 +80,19 @@ click-repl==0.3.0
# via
# -r requirements/quality.txt
# celery
code-annotations==1.6.0
code-annotations==1.7.0
# via
# -r requirements/quality.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.4.2
coverage[toml]==7.4.4
# via
# -r requirements/quality.txt
# pytest-cov
ddt==1.7.1
ddt==1.7.2
# via -r requirements/quality.txt
diff-cover==8.0.3
# via -r requirements/dev.in
Expand All @@ -103,8 +104,9 @@ distlib==0.3.8
# via
# -r requirements/ci.txt
# virtualenv
django==4.2.10
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/quality.txt
# django-crum
# django-model-utils
Expand All @@ -126,11 +128,11 @@ django-waffle==4.1.0
# via
# -r requirements/quality.txt
# edx-django-utils
djangorestframework==3.14.0
djangorestframework==3.15.1
# via -r requirements/quality.txt
edx-celeryutils==1.2.5
# via -r requirements/quality.txt
edx-django-utils==5.10.1
edx-django-utils==5.12.0
# via -r requirements/quality.txt
edx-i18n-tools==1.3.0
# via -r requirements/dev.in
Expand All @@ -140,15 +142,20 @@ exceptiongroup==1.2.0
# via
# -r requirements/quality.txt
# pytest
filelock==3.13.1
filelock==3.13.3
# via
# -r requirements/ci.txt
# tox
# virtualenv
freezegun==1.4.0
# via -r requirements/quality.txt
importlib-metadata==7.0.1
greenlet==3.0.3
# via
# -r requirements/quality.txt
# sqlalchemy
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# -r requirements/pip-tools.txt
# build
iniconfig==2.0.0
Expand All @@ -168,11 +175,11 @@ jsonfield==3.1.0
# via
# -r requirements/quality.txt
# edx-celeryutils
kombu==5.3.5
kombu==5.3.6
# via
# -r requirements/quality.txt
# celery
lxml==5.1.0
lxml==5.2.0
# via edx-i18n-tools
markupsafe==2.1.5
# via
Expand All @@ -184,11 +191,11 @@ mccabe==0.7.0
# pylint
mock==5.1.0
# via -r requirements/quality.txt
newrelic==9.7.0
newrelic==9.8.0
# via
# -r requirements/quality.txt
# edx-django-utils
packaging==23.2
packaging==24.0
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand All @@ -203,7 +210,7 @@ pbr==6.0.0
# via
# -r requirements/quality.txt
# stevedore
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.txt
platformdirs==4.2.0
# via
Expand Down Expand Up @@ -231,15 +238,15 @@ psutil==5.9.8
# edx-django-utils
pycodestyle==2.11.1
# via -r requirements/quality.txt
pycparser==2.21
pycparser==2.22
# via
# -r requirements/quality.txt
# cffi
pydocstyle==6.3.0
# via -r requirements/quality.txt
pygments==2.17.2
# via diff-cover
pylint==3.0.3
pylint==3.1.0
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -272,16 +279,16 @@ pyproject-hooks==1.0.0
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.0.1
pytest==8.1.1
# via
# -r requirements/quality.txt
# pytest-cov
# pytest-django
pytest-cov==4.1.0
pytest-cov==5.0.0
# via -r requirements/quality.txt
pytest-django==4.8.0
# via -r requirements/quality.txt
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# -r requirements/quality.txt
# celery
Expand All @@ -290,10 +297,6 @@ python-slugify==8.0.4
# via
# -r requirements/quality.txt
# code-annotations
pytz==2024.1
# via
# -r requirements/quality.txt
# djangorestframework
pyyaml==6.0.1
# via
# -r requirements/quality.txt
Expand All @@ -310,7 +313,7 @@ snowballstemmer==2.2.0
# via
# -r requirements/quality.txt
# pydocstyle
sqlalchemy==2.0.27
sqlalchemy==2.0.29
# via -r requirements/quality.txt
sqlparse==0.4.4
# via
Expand Down Expand Up @@ -338,13 +341,13 @@ tomli==2.0.1
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.3
tomlkit==0.12.4
# via
# -r requirements/quality.txt
# pylint
tox==4.13.0
tox==4.14.2
# via -r requirements/ci.txt
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# -r requirements/quality.txt
# asgiref
Expand All @@ -371,11 +374,12 @@ wcwidth==0.2.13
# via
# -r requirements/quality.txt
# prompt-toolkit
wheel==0.42.0
wheel==0.43.0
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# pip-tools
zipp==3.17.0
zipp==3.18.1
# via
# -r requirements/pip-tools.txt
# importlib-metadata
Expand Down
Loading

0 comments on commit 1df1f55

Please sign in to comment.