Skip to content

Commit

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

Python Requirements Update
  • Loading branch information
@farhan
farhan authored Nov 13, 2023
2 parents 396bd74 + 43ebfe9 commit 529c0c8
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 57 deletions.
6 changes: 3 additions & 3 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ asgiref==3.7.2
# via django
binaryornot==0.4.4
# via cookiecutter
boto3==1.28.78
boto3==1.28.84
# via fs-s3fs
botocore==1.31.78
botocore==1.31.84
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -56,7 +56,7 @@ lxml==4.9.3
# via
# -r requirements/base.in
# xblock
mako==1.2.4
mako==1.3.0
# via xblock
markdown-it-py==3.0.0
# via rich
Expand Down
26 changes: 17 additions & 9 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,35 @@
#
# 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.13.1
# via
# tox
# virtualenv
packaging==23.2
# via tox
# via
# pyproject-api
# tox
platformdirs==3.11.0
# via virtualenv
# via
# 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
# pyproject-api
# tox
tox==4.11.3
# via -r requirements/ci.in
virtualenv==20.24.6
# via tox
4 changes: 0 additions & 4 deletions requirements/common_constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,3 @@ 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
36 changes: 23 additions & 13 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,21 @@ binaryornot==0.4.4
# -r requirements/base.txt
# -r requirements/test.txt
# cookiecutter
boto3==1.28.78
boto3==1.28.84
# via
# -r requirements/base.txt
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.78
botocore==1.31.84
# via
# -r requirements/base.txt
# -r requirements/test.txt
# boto3
# s3transfer
cachetools==5.3.2
# via
# -r requirements/test.txt
# tox
certifi==2023.7.22
# via
# -r requirements/base.txt
Expand All @@ -53,6 +57,7 @@ chardet==5.2.0
# -r requirements/base.txt
# -r requirements/test.txt
# binaryornot
# tox
charset-normalizer==3.3.2
# via
# -r requirements/base.txt
Expand All @@ -70,6 +75,10 @@ click-log==0.4.0
# via edx-lint
code-annotations==1.5.0
# via edx-lint
colorama==0.4.6
# via
# -r requirements/test.txt
# tox
cookiecutter==2.4.0
# via
# -r requirements/base.txt
Expand All @@ -79,7 +88,7 @@ coverage[toml]==7.3.2
# -r requirements/test.in
# -r requirements/test.txt
# pytest-cov
ddt==1.6.0
ddt==1.7.0
# via
# -r requirements/test.in
# -r requirements/test.txt
Expand Down Expand Up @@ -154,7 +163,7 @@ lxml==4.9.3
# -r requirements/base.txt
# -r requirements/test.txt
# xblock
mako==1.2.4
mako==1.3.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -191,25 +200,23 @@ openedx-django-pyfs==3.4.0
packaging==23.2
# via
# -r requirements/test.txt
# pyproject-api
# pytest
# pytest-rerunfailures
# tox
pbr==5.11.1
pbr==6.0.0
# via stevedore
platformdirs==3.11.0
# via
# -r requirements/test.txt
# pylint
# tox
# virtualenv
pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
# tox
py==1.11.0
# via
# -r requirements/test.txt
# tox
pycodestyle==2.11.1
# via -r requirements/quality.in
pydocstyle==6.3.0
Expand Down Expand Up @@ -237,6 +244,10 @@ pypng==0.20220715.0
# via
# -r requirements/base.txt
# -r requirements/test.txt
pyproject-api==1.6.1
# via
# -r requirements/test.txt
# tox
pytest==7.4.3
# via
# -r requirements/test.txt
Expand All @@ -247,7 +258,7 @@ pytest-cov==4.1.0
# via
# -r requirements/test.in
# -r requirements/test.txt
pytest-django==4.6.0
pytest-django==4.7.0
# via
# -r requirements/test.in
# -r requirements/test.txt
Expand Down Expand Up @@ -309,7 +320,6 @@ six==1.16.0
# fs
# fs-s3fs
# python-dateutil
# tox
snowballstemmer==2.2.0
# via pydocstyle
sqlparse==0.4.4
Expand All @@ -329,13 +339,13 @@ tomli==2.0.1
# -r requirements/test.txt
# coverage
# pylint
# pyproject-api
# pytest
# tox
tomlkit==0.12.2
# via pylint
tox==3.28.0
tox==4.11.3
# via
# -c requirements/common_constraints.txt
# -r requirements/test.in
# -r requirements/test.txt
types-python-dateutil==2.8.19.14
Expand Down
39 changes: 24 additions & 15 deletions requirements/quality.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ binaryornot==0.4.4
# via
# -r requirements/test.txt
# cookiecutter
boto3==1.28.78
boto3==1.28.84
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.78
botocore==1.31.84
# via
# -r requirements/test.txt
# boto3
# s3transfer
cachetools==5.3.2
# via
# -r requirements/test.txt
# tox
certifi==2023.7.22
# via
# -r requirements/test.txt
Expand All @@ -43,6 +47,7 @@ chardet==5.2.0
# via
# -r requirements/test.txt
# binaryornot
# tox
charset-normalizer==3.3.2
# via
# -r requirements/test.txt
Expand All @@ -58,14 +63,18 @@ click-log==0.4.0
# via edx-lint
code-annotations==1.5.0
# via edx-lint
colorama==0.4.6
# via
# -r requirements/test.txt
# tox
cookiecutter==2.4.0
# via -r requirements/test.txt
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# coverage
# pytest-cov
ddt==1.6.0
ddt==1.7.0
# via -r requirements/test.txt
dill==0.3.7
# via pylint
Expand Down Expand Up @@ -130,7 +139,7 @@ lxml==4.9.3
# via
# -r requirements/test.txt
# xblock
mako==1.2.4
mako==1.3.0
# via
# -r requirements/test.txt
# acid-xblock
Expand Down Expand Up @@ -160,25 +169,23 @@ openedx-django-pyfs==3.4.0
packaging==23.2
# via
# -r requirements/test.txt
# pyproject-api
# pytest
# pytest-rerunfailures
# tox
pbr==5.11.1
pbr==6.0.0
# via stevedore
platformdirs==3.11.0
# via
# -r requirements/test.txt
# pylint
# tox
# virtualenv
pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
# tox
py==1.11.0
# via
# -r requirements/test.txt
# tox
pycodestyle==2.11.1
# via -r requirements/quality.in
pydocstyle==6.3.0
Expand All @@ -203,6 +210,10 @@ pylint-plugin-utils==0.8.2
# pylint-django
pypng==0.20220715.0
# via -r requirements/test.txt
pyproject-api==1.6.1
# via
# -r requirements/test.txt
# tox
pytest==7.4.3
# via
# -r requirements/test.txt
Expand All @@ -211,7 +222,7 @@ pytest==7.4.3
# pytest-rerunfailures
pytest-cov==4.1.0
# via -r requirements/test.txt
pytest-django==4.6.0
pytest-django==4.7.0
# via -r requirements/test.txt
pytest-rerunfailures==12.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -260,7 +271,6 @@ six==1.16.0
# fs
# fs-s3fs
# python-dateutil
# tox
snowballstemmer==2.2.0
# via pydocstyle
sqlparse==0.4.4
Expand All @@ -278,14 +288,13 @@ tomli==2.0.1
# -r requirements/test.txt
# coverage
# pylint
# pyproject-api
# pytest
# tox
tomlkit==0.12.2
# via pylint
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
tox==4.11.3
# via -r requirements/test.txt
types-python-dateutil==2.8.19.14
# via
# -r requirements/test.txt
Expand Down
Loading

0 comments on commit 529c0c8

Please sign in to comment.