Skip to content

Commit

Permalink
Merge pull request #70 from openedx/jenkins/upgrade-python-requiremen…
Browse files Browse the repository at this point in the history
…ts-a1e4f3e

Python Requirements Update
  • Loading branch information
UsamaSadiq authored Nov 20, 2023
2 parents a1e4f3e + dfa06c8 commit f0a60da
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 74 deletions.
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
edx-opaque-keys==2.5.1
# via -r requirements/base.in
pbr==5.11.1
pbr==6.0.0
# via stevedore
pymongo==3.13.0
# via edx-opaque-keys
Expand Down
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
2 changes: 0 additions & 2 deletions requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@
-r pip-tools.txt # pip-tools and its dependencies, for managing requirements files
-r test.txt # Dependencies for testing and quality checks
-r ci.txt # tox and associated dependencies

tox-battery # Makes tox aware of requirements file changes
69 changes: 38 additions & 31 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
astroid==2.15.8
astroid==3.0.1
# via
# -r requirements/test.txt
# pylint
Expand All @@ -13,6 +13,16 @@ build==1.0.3
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.3.2
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
chardet==5.2.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
click==8.1.7
# via
# -r requirements/pip-tools.txt
Expand All @@ -29,9 +39,14 @@ code-annotations==1.5.0
# via
# -r requirements/test.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
coverage==7.3.2
# via -r requirements/test.txt
ddt==1.6.0
ddt==1.7.0
# via -r requirements/test.txt
dill==0.3.7
# via
Expand All @@ -42,15 +57,15 @@ distlib==0.3.7
# -r requirements/ci.txt
# -r requirements/test.txt
# virtualenv
edx-lint==5.3.4
edx-lint==5.3.6
# via -r requirements/test.txt
edx-opaque-keys==2.5.1
# via -r requirements/test.txt
exceptiongroup==1.1.3
# via
# -r requirements/test.txt
# pytest
filelock==3.12.4
filelock==3.13.1
# via
# -r requirements/ci.txt
# -r requirements/test.txt
Expand All @@ -73,9 +88,7 @@ jinja2==3.1.2
# -r requirements/test.txt
# code-annotations
lazy-object-proxy==1.9.0
# via
# -r requirements/test.txt
# astroid
# via -r requirements/test.txt
markupsafe==2.1.3
# via
# -r requirements/test.txt
Expand All @@ -92,34 +105,32 @@ packaging==23.2
# -r requirements/pip-tools.txt
# -r requirements/test.txt
# build
# pyproject-api
# pytest
# tox
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
pip-tools==7.3.0
# via -r requirements/pip-tools.txt
platformdirs==3.11.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.txt
# -r requirements/test.txt
# pylint
# tox
# virtualenv
pluggy==1.3.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# pytest
# tox
py==1.11.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/test.txt
pylint==2.17.7
pylint==3.0.2
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -130,7 +141,7 @@ pylint-celery==0.3
# via
# -r requirements/test.txt
# edx-lint
pylint-django==2.5.3
pylint-django==2.5.5
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -143,11 +154,16 @@ pymongo==3.13.0
# via
# -r requirements/test.txt
# edx-opaque-keys
pyproject-api==1.6.1
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
# build
pytest==7.4.2
pytest==7.4.3
# via -r requirements/test.txt
python-slugify==8.0.1
# via
Expand All @@ -159,10 +175,8 @@ pyyaml==6.0.1
# code-annotations
six==1.16.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# edx-lint
# tox
stevedore==5.1.0
# via
# -r requirements/test.txt
Expand All @@ -180,40 +194,33 @@ tomli==2.0.1
# build
# pip-tools
# pylint
# pyproject-api
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.1
tomlkit==0.12.3
# via
# -r requirements/test.txt
# pylint
tox==3.28.0
tox==4.11.3
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.txt
# -r requirements/test.txt
# tox-battery
tox-battery==0.6.2
# via -r requirements/dev.in
typing-extensions==4.8.0
# via
# -r requirements/test.txt
# astroid
# edx-opaque-keys
# pylint
virtualenv==20.24.5
virtualenv==20.24.6
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
wheel==0.41.2
wheel==0.41.3
# via
# -r requirements/pip-tools.txt
# pip-tools
wrapt==1.15.0
# via
# -r requirements/test.txt
# astroid
zipp==3.17.0
# via
# -r requirements/pip-tools.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.2
wheel==0.41.3
# via pip-tools
zipp==3.17.0
# via importlib-metadata
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.2
wheel==0.41.3
# via -r requirements/pip.in

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

0 comments on commit f0a60da

Please sign in to comment.