Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
UsamaSadiq committed Nov 15, 2023
2 parents a72c239 + 83fef49 commit 944d1cb
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 32 deletions.
29 changes: 19 additions & 10 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@
#
# make upgrade
#
cachetools==5.3.2
# via tox
certifi==2023.7.22
# via requests
chardet==5.2.0
# via tox
charset-normalizer==3.3.2
# via requests
codecov==2.1.13
# via -r requirements/ci.in
colorama==0.4.6
# via tox
coverage==7.3.2
# via codecov
distlib==0.3.7
Expand All @@ -21,24 +27,27 @@ filelock==3.13.1
idna==3.4
# via requests
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
pyproject-api==1.6.1
# via tox
requests==2.31.0
# via codecov
six==1.16.0
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.in
urllib3==2.0.7
# pyproject-api
# tox
tox==4.11.3
# via -r requirements/ci.in
urllib3==2.1.0
# via requests
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
34 changes: 20 additions & 14 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@ astroid==3.0.1
# pylint-celery
build==1.0.3
# via -r requirements/quality.in
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
# via
# diff-cover
# tox
charset-normalizer==3.3.2
# via requests
click==8.1.7
Expand All @@ -29,9 +33,11 @@ click-log==0.4.0
# via edx-lint
code-annotations==1.5.0
# via edx-lint
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
Expand Down Expand Up @@ -77,7 +83,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 @@ -96,6 +102,7 @@ nh3==0.2.14
packaging==23.2
# via
# build
# pyproject-api
# tox
path==16.7.1
# via edx-i18n-tools
Expand All @@ -105,16 +112,16 @@ 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 @@ -140,6 +147,8 @@ pylint-plugin-utils==0.8.2
# via
# pylint-celery
# pylint-django
pyproject-api==1.6.1
# via tox
pyproject-hooks==1.0.0
# via build
python-slugify==8.0.1
Expand All @@ -165,9 +174,7 @@ rich==13.6.0
secretstorage==3.3.3
# via keyring
six==1.16.0
# via
# edx-lint
# tox
# via edx-lint
sqlparse==0.4.4
# via django
stevedore==5.1.0
Expand All @@ -178,14 +185,13 @@ tomli==2.0.1
# via
# build
# pylint
# pyproject-api
# pyproject-hooks
# tox
tomlkit==0.12.2
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
Expand All @@ -196,7 +202,7 @@ typing-extensions==4.8.0
# astroid
# pylint
# rich
urllib3==2.0.7
urllib3==2.1.0
# via
# requests
# twine
Expand Down
10 changes: 6 additions & 4 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jeepney==0.8.0
# secretstorage
jinja2==3.1.2
# via code-annotations
keyring==24.2.0
keyring==24.3.0
# via twine
markdown-it-py==3.0.0
# via rich
Expand All @@ -75,7 +75,9 @@ pbr==6.0.0
pkginfo==1.9.6
# via twine
platformdirs==3.11.0
# via pylint
# via
# -c requirements/common_constraints.txt
# pylint
pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
Expand Down Expand Up @@ -131,7 +133,7 @@ tomli==2.0.1
# build
# pylint
# pyproject-hooks
tomlkit==0.12.2
tomlkit==0.12.3
# via pylint
twine==4.0.2
# via -r requirements/quality.in
Expand All @@ -140,7 +142,7 @@ typing-extensions==4.8.0
# astroid
# pylint
# rich
urllib3==2.0.7
urllib3==2.1.0
# via
# requests
# twine
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pytest-catchlog==1.2.2
# via -r requirements/test.in
pytest-cov==4.1.0
# via -r requirements/test.in
pytest-django==4.6.0
pytest-django==4.7.0
# via -r requirements/test.in
pytz==2023.3.post1
# via django
Expand Down

0 comments on commit 944d1cb

Please sign in to comment.