Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
MichaelRoytman authored Dec 1, 2023
2 parents eb77d19 + fcf4b97 commit 0a0ffcf
Show file tree
Hide file tree
Showing 8 changed files with 130 additions and 34 deletions.
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ certifi==2023.11.17
# via requests
charset-normalizer==3.3.2
# via requests
idna==3.4
idna==3.6
# via requests
lxml==4.9.3
# via -r requirements/base.in
Expand Down
37 changes: 28 additions & 9 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
#
# make upgrade
#
appdirs==1.4.4
# via virtualenv
black==23.11.0
# via -r requirements/quality.txt
cachetools==5.3.2
# via tox
certifi==2023.11.17
# via
# -r requirements/quality.txt
# requests
chardet==5.2.0
# via tox
charset-normalizer==3.3.2
# via
# -r requirements/quality.txt
Expand All @@ -20,6 +22,8 @@ click==8.1.7
# via
# -r requirements/quality.txt
# black
colorama==0.4.6
# via tox
coverage[toml]==7.3.2
# via
# -r requirements/ci.in
Expand All @@ -28,13 +32,17 @@ coverage[toml]==7.3.2
# pytest-cov
distlib==0.3.7
# via virtualenv
exceptiongroup==1.2.0
# via
# -r requirements/quality.txt
# pytest
filelock==3.13.1
# via
# tox
# virtualenv
flake8==6.1.0
# via -r requirements/quality.txt
idna==3.4
idna==3.6
# via
# -r requirements/quality.txt
# requests
Expand All @@ -56,6 +64,7 @@ packaging==23.2
# via
# -r requirements/quality.txt
# black
# pyproject-api
# pytest
# tox
pathspec==0.11.2
Expand All @@ -66,13 +75,13 @@ platformdirs==4.0.0
# via
# -r requirements/quality.txt
# black
# tox
# virtualenv
pluggy==1.3.0
# via
# -r requirements/quality.txt
# pytest
# tox
py==1.11.0
# via tox
pycodestyle==2.11.1
# via
# -r requirements/quality.txt
Expand All @@ -81,6 +90,8 @@ pyflakes==3.1.0
# via
# -r requirements/quality.txt
# flake8
pyproject-api==1.6.1
# via tox
pytest==7.4.3
# via
# -r requirements/quality.txt
Expand All @@ -92,17 +103,25 @@ pytest-mock==3.12.0
# via -r requirements/quality.txt
requests==2.31.0
# via -r requirements/quality.txt
six==1.16.0
tomli==2.0.1
# via
# -r requirements/quality.txt
# black
# coverage
# pyproject-api
# pytest
# tox
# virtualenv
tox==3.28.0
tox==4.11.4
# via -r requirements/ci.in
typing-extensions==4.8.0
# via
# -r requirements/quality.txt
# black
urllib3==2.1.0
# via
# -r requirements/quality.txt
# requests
virtualenv==20.4.7
virtualenv==20.24.7
# via tox
xmlformatter==0.2.4
# via -r requirements/quality.txt
Expand Down
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
81 changes: 65 additions & 16 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
#
# make upgrade
#
appdirs==1.4.4
# via
# -r requirements/ci.txt
# virtualenv
black==23.11.0
# via
# -r requirements/ci.txt
Expand All @@ -18,11 +14,21 @@ build==1.0.3
# pip-tools
bump2version==1.0.1
# via -r requirements/dev.in
cachetools==5.3.2
# via
# -r requirements/ci.txt
# tox
certifi==2023.11.17
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# requests
cffi==1.16.0
# via cryptography
chardet==5.2.0
# via
# -r requirements/ci.txt
# tox
charset-normalizer==3.3.2
# via
# -r requirements/ci.txt
Expand All @@ -35,18 +41,29 @@ click==8.1.7
# -r requirements/quality.txt
# black
# pip-tools
colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.3.2
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# coverage
# pytest-cov
cryptography==41.0.7
# via secretstorage
distlib==0.3.7
# via
# -r requirements/ci.txt
# virtualenv
docutils==0.20.1
# via readme-renderer
exceptiongroup==1.2.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pytest
filelock==3.13.1
# via
# -r requirements/ci.txt
Expand All @@ -56,22 +73,30 @@ flake8==6.1.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
idna==3.4
idna==3.6
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# requests
importlib-metadata==6.8.0
# via
# -r requirements/pip-tools.txt
# build
# keyring
# twine
importlib-resources==6.1.1
# via keyring
iniconfig==2.0.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pytest
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
keyring==24.3.0
# via twine
lxml==4.9.3
Expand Down Expand Up @@ -103,6 +128,7 @@ packaging==23.2
# -r requirements/quality.txt
# black
# build
# pyproject-api
# pytest
# tox
pathspec==0.11.2
Expand All @@ -119,30 +145,34 @@ platformdirs==4.0.0
# -r requirements/ci.txt
# -r requirements/quality.txt
# black
# tox
# virtualenv
pluggy==1.3.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pytest
# tox
py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.11.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# flake8
pycparser==2.21
# via cffi
pyflakes==3.1.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# flake8
pygments==2.17.1
pygments==2.17.2
# via
# readme-renderer
# rich
pyproject-api==1.6.1
# via
# -r requirements/ci.txt
# tox
pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
Expand Down Expand Up @@ -175,26 +205,42 @@ rfc3986==2.0.0
# via twine
rich==13.7.0
# via twine
six==1.16.0
secretstorage==3.3.3
# via keyring
tomli==2.0.1
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# black
# build
# coverage
# pip-tools
# pyproject-api
# pyproject-hooks
# pytest
# tox
# virtualenv
tox==3.28.0
tox==4.11.4
# via -r requirements/ci.txt
twine==4.0.2
# via -r requirements/dev.in
typing-extensions==4.8.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# black
# rich
urllib3==2.1.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# requests
# twine
virtualenv==20.4.7
virtualenv==20.24.7
# via
# -r requirements/ci.txt
# tox
wheel==0.41.3
wheel==0.42.0
# via
# -r requirements/dev.in
# -r requirements/pip-tools.txt
Expand All @@ -208,7 +254,10 @@ youtube-dl==2021.12.17
# -r requirements/ci.txt
# -r requirements/quality.txt
zipp==3.17.0
# via importlib-metadata
# via
# -r requirements/pip-tools.txt
# importlib-metadata
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
11 changes: 10 additions & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,23 @@ build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
# via build
packaging==23.2
# via build
pip-tools==7.3.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
wheel==0.41.3
tomli==2.0.1
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.42.0
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
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.41.3
wheel==0.42.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.3.1
# via -r requirements/pip.in
setuptools==69.0.1
setuptools==69.0.2
# via -r requirements/pip.in
Loading

0 comments on commit 0a0ffcf

Please sign in to comment.