Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
UsamaSadiq authored Nov 16, 2023
2 parents 027c1cc + a05fdba commit 8dd572f
Show file tree
Hide file tree
Showing 10 changed files with 99 additions and 79 deletions.
16 changes: 8 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
#
# make upgrade
#
amqp==5.1.1
amqp==5.2.0
# via kombu
asgiref==3.7.2
# via django
backports-zoneinfo[tzdata]==0.2.1
# via
# celery
# kombu
billiard==4.1.0
billiard==4.2.0
# via celery
celery==5.3.4
celery==5.3.5
# via
# -c requirements/constraints.txt
# -r requirements/base.in
Expand All @@ -30,7 +30,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
django==3.2.22
django==3.2.23
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -40,9 +40,9 @@ django-model-utils==4.3.1
# via -r requirements/base.in
jsonfield==3.1.0
# via -r requirements/base.in
kombu==5.3.2
kombu==5.3.3
# via celery
prompt-toolkit==3.0.39
prompt-toolkit==3.0.41
# via click-repl
python-dateutil==2.8.2
# via celery
Expand All @@ -60,10 +60,10 @@ tzdata==2023.3
# via
# backports-zoneinfo
# celery
vine==5.0.0
vine==5.1.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.8
wcwidth==0.2.10
# via prompt-toolkit
12 changes: 6 additions & 6 deletions requirements/celery50.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
amqp==5.1.1
billiard==4.1.0
celery==5.3.4
amqp==5.2.0
billiard==4.2.0
celery==5.3.5
click==8.1.7
click-didyoumean==0.3.0
click-repl==0.3.0
kombu==5.3.2
prompt-toolkit==3.0.39
vine==5.0.0
kombu==5.3.3
prompt-toolkit==3.0.41
vine==5.1.0
31 changes: 20 additions & 11 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,36 @@
#
# make upgrade
#
cachetools==5.3.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.7
# via virtualenv
filelock==3.12.4
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
# via tox
# via
# pyproject-api
# tox
platformdirs==3.11.0
# via virtualenv
# via
# -c requirements/common_constraints.txt
# tox
# virtualenv
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
six==1.16.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.in
virtualenv==20.24.5
# pyproject-api
# tox
tox==4.11.3
# via -r requirements/ci.in
virtualenv==20.24.6
# via tox
7 changes: 4 additions & 3 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ 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

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
# This constraint can be removed once the issue
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
platformdirs<4.0
54 changes: 31 additions & 23 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ astroid==3.0.1
# via
# pylint
# pylint-celery
cachetools==5.3.2
# via tox
certifi==2023.7.22
# via requests
cffi==1.16.0
# via cryptography
chardet==5.2.0
# via diff-cover
charset-normalizer==3.3.1
# via
# diff-cover
# tox
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
Expand All @@ -27,27 +31,29 @@ click-log==0.4.0
# via edx-lint
code-annotations==1.5.0
# via edx-lint
cryptography==41.0.4
colorama==0.4.6
# via tox
cryptography==41.0.5
# via secretstorage
diff-cover==8.0.0
diff-cover==8.0.1
# via -r requirements/dev.in
dill==0.3.7
# via pylint
distlib==0.3.7
# via virtualenv
django==3.2.22
django==3.2.23
# via
# -c requirements/common_constraints.txt
# edx-i18n-tools
docutils==0.20.1
# via readme-renderer
edx-i18n-tools==1.3.0
# via -r requirements/dev.in
edx-lint==5.3.4
edx-lint==5.3.6
# via
# -r requirements/dev.in
# -r requirements/quality.in
filelock==3.12.4
filelock==3.13.1
# via
# tox
# virtualenv
Expand All @@ -57,7 +63,7 @@ importlib-metadata==6.8.0
# via
# keyring
# twine
importlib-resources==6.1.0
importlib-resources==6.1.1
# via keyring
isort==5.12.0
# via
Expand All @@ -73,7 +79,7 @@ jinja2==3.1.2
# via
# code-annotations
# diff-cover
keyring==24.2.0
keyring==24.3.0
# via twine
lxml==4.9.3
# via edx-i18n-tools
Expand All @@ -90,25 +96,27 @@ more-itertools==10.1.0
nh3==0.2.14
# via readme-renderer
packaging==23.2
# via tox
# via
# pyproject-api
# tox
path==16.7.1
# via edx-i18n-tools
pbr==5.11.1
pbr==6.0.0
# via stevedore
pkginfo==1.9.6
# via twine
platformdirs==3.11.0
# via
# -c requirements/common_constraints.txt
# pylint
# tox
# virtualenv
pluggy==1.3.0
# via
# diff-cover
# tox
polib==1.2.0
# via edx-i18n-tools
py==1.11.0
# via tox
pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
Expand All @@ -134,6 +142,8 @@ pylint-plugin-utils==0.8.2
# via
# pylint-celery
# pylint-django
pyproject-api==1.6.1
# via tox
python-slugify==8.0.1
# via code-annotations
pytz==2023.3.post1
Expand All @@ -152,15 +162,14 @@ requests-toolbelt==1.0.0
# via twine
rfc3986==2.0.0
# via twine
rich==13.6.0
rich==13.7.0
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
# via
# edx-lint
# pydocstyle
# tox
snowballstemmer==2.2.0
# via pydocstyle
sqlparse==0.4.4
Expand All @@ -172,13 +181,12 @@ text-unidecode==1.3
tomli==2.0.1
# via
# pylint
# pyproject-api
# tox
tomlkit==0.12.1
tomlkit==0.12.3
# via pylint
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/dev.in
tox==4.11.3
# via -r requirements/dev.in
twine==4.0.2
# via -r requirements/dev.in
typing-extensions==4.8.0
Expand All @@ -187,13 +195,13 @@ typing-extensions==4.8.0
# astroid
# pylint
# rich
urllib3==2.0.7
urllib3==2.1.0
# via
# requests
# twine
virtualenv==20.24.5
virtualenv==20.24.6
# via tox
wheel==0.41.2
wheel==0.41.3
# via -r requirements/dev.in
zipp==3.17.0
# via
Expand Down
Loading

0 comments on commit 8dd572f

Please sign in to comment.