Skip to content

Commit

Permalink
Merge pull request #216 from openedx/jenkins/zshkoor/tox40-updates-fd…
Browse files Browse the repository at this point in the history 
…b0bfa

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
@UsamaSadiq
UsamaSadiq authored Oct 26, 2023
2 parents fdb0bfa + 02f3935 commit f14e74a
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 88 deletions.
6 changes: 3 additions & 3 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
asgiref==3.7.2
# via django
django==3.2.20
django==3.2.22
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand All @@ -19,12 +19,12 @@ djangorestframework==3.14.0
# via -r requirements/base.in
jsonfield==3.1.0
# via -r requirements/base.in
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/base.in
# django
# djangorestframework
sqlparse==0.4.4
# via django
typing-extensions==4.7.1
typing-extensions==4.8.0
# via asgiref
14 changes: 7 additions & 7 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
certifi==2023.7.22
# via requests
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via requests
coverage==6.5.0
# via coveralls
Expand All @@ -18,22 +18,22 @@ distlib==0.3.7
# virtualenv
docopt==0.6.2
# via coveralls
filelock==3.12.2
filelock==3.12.4
# via
# -r requirements/tox.txt
# tox
# virtualenv
idna==3.4
# via requests
packaging==23.1
packaging==23.2
# via
# -r requirements/tox.txt
# tox
platformdirs==3.10.0
platformdirs==3.11.0
# via
# -r requirements/tox.txt
# virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -55,9 +55,9 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/tox.txt
urllib3==2.0.4
urllib3==2.0.7
# via requests
virtualenv==20.24.2
virtualenv==20.24.5
# via
# -r requirements/tox.txt
# tox
51 changes: 22 additions & 29 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ asgiref==3.7.2
# -r requirements/docs.txt
# -r requirements/test.txt
# django
astroid==2.15.6
astroid==3.0.1
# via
# -r requirements/test.txt
# pylint
# pylint-celery
babel==2.12.1
babel==2.13.0
# via
# -r requirements/docs.txt
# -r requirements/test.txt
Expand All @@ -41,12 +41,12 @@ certifi==2023.7.22
# -r requirements/docs.txt
# -r requirements/test.txt
# requests
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via
# -r requirements/docs.txt
# -r requirements/test.txt
# requests
click==8.1.6
click==8.1.7
# via
# -r requirements/test.txt
# click-log
Expand All @@ -60,17 +60,18 @@ code-annotations==1.5.0
# via
# -r requirements/test.txt
# edx-lint
coverage[toml]==7.2.7
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# coverage
# pytest-cov
ddt==1.6.0
# via -r requirements/test.txt
dill==0.3.7
# via
# -r requirements/test.txt
# pylint
django==3.2.20
django==3.2.22
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
Expand All @@ -97,13 +98,13 @@ docutils==0.19
# sphinx
edx-lint==5.3.4
# via -r requirements/test.txt
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via
# -r requirements/test.txt
# pytest
factory-boy==3.3.0
# via -r requirements/test.txt
faker==19.3.0
faker==19.11.0
# via
# -r requirements/test.txt
# factory-boy
Expand Down Expand Up @@ -143,10 +144,6 @@ jsonfield==3.1.0
# -r requirements/base.txt
# -r requirements/docs.txt
# -r requirements/test.txt
lazy-object-proxy==1.9.0
# via
# -r requirements/test.txt
# astroid
markupsafe==2.1.3
# via
# -r requirements/docs.txt
Expand All @@ -158,7 +155,7 @@ mccabe==0.7.0
# pylint
mock==5.1.0
# via -r requirements/test.txt
packaging==23.1
packaging==23.2
# via
# -r requirements/docs.txt
# -r requirements/test.txt
Expand All @@ -169,11 +166,11 @@ pbr==5.11.1
# via
# -r requirements/test.txt
# stevedore
platformdirs==3.10.0
platformdirs==3.11.0
# via
# -r requirements/test.txt
# pylint
pluggy==1.2.0
pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
Expand All @@ -182,9 +179,9 @@ pockets==0.9.1
# -r requirements/docs.txt
# -r requirements/test.txt
# sphinxcontrib-napoleon
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/test.txt
pydata-sphinx-theme==0.13.3
pydata-sphinx-theme==0.14.1
# via
# -r requirements/docs.txt
# -r requirements/test.txt
Expand All @@ -196,7 +193,7 @@ pygments==2.16.1
# accessible-pygments
# pydata-sphinx-theme
# sphinx
pylint==2.17.5
pylint==3.0.2
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -207,7 +204,7 @@ pylint-celery==0.3
# via
# -r requirements/test.txt
# edx-lint
pylint-django==2.5.3
pylint-django==2.5.4
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -216,7 +213,7 @@ pylint-plugin-utils==0.8.2
# -r requirements/test.txt
# pylint-celery
# pylint-django
pytest==7.4.0
pytest==7.4.2
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -234,7 +231,7 @@ python-slugify==8.0.1
# via
# -r requirements/test.txt
# code-annotations
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/base.txt
# -r requirements/docs.txt
Expand Down Expand Up @@ -264,7 +261,7 @@ snowballstemmer==2.2.0
# -r requirements/docs.txt
# -r requirements/test.txt
# sphinx
soupsieve==2.4.1
soupsieve==2.5
# via
# -r requirements/docs.txt
# -r requirements/test.txt
Expand Down Expand Up @@ -337,7 +334,7 @@ tomlkit==0.12.1
# via
# -r requirements/test.txt
# pylint
typing-extensions==4.7.1
typing-extensions==4.8.0
# via
# -r requirements/base.txt
# -r requirements/docs.txt
Expand All @@ -347,16 +344,12 @@ typing-extensions==4.7.1
# faker
# pydata-sphinx-theme
# pylint
urllib3==2.0.4
urllib3==2.0.7
# via
# -r requirements/docs.txt
# -r requirements/test.txt
# requests
wrapt==1.15.0
# via
# -r requirements/test.txt
# astroid
zipp==3.16.2
zipp==3.17.0
# via
# -r requirements/docs.txt
# -r requirements/test.txt
Expand Down
20 changes: 10 additions & 10 deletions requirements/docs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
babel==2.12.1
babel==2.13.0
# via
# pydata-sphinx-theme
# sphinx
beautifulsoup4==4.12.2
# via pydata-sphinx-theme
certifi==2023.7.22
# via requests
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via requests
django==3.2.20
django==3.2.22
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
Expand All @@ -49,20 +49,20 @@ jsonfield==3.1.0
# via -r requirements/base.txt
markupsafe==2.1.3
# via jinja2
packaging==23.1
packaging==23.2
# via
# pydata-sphinx-theme
# sphinx
pockets==0.9.1
# via sphinxcontrib-napoleon
pydata-sphinx-theme==0.13.3
pydata-sphinx-theme==0.14.1
# via sphinx-book-theme
pygments==2.16.1
# via
# accessible-pygments
# pydata-sphinx-theme
# sphinx
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/base.txt
# babel
Expand All @@ -76,7 +76,7 @@ six==1.16.0
# sphinxcontrib-napoleon
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.4.1
soupsieve==2.5
# via beautifulsoup4
sphinx==6.2.1
# via
Expand All @@ -103,12 +103,12 @@ sqlparse==0.4.4
# via
# -r requirements/base.txt
# django
typing-extensions==4.7.1
typing-extensions==4.8.0
# via
# -r requirements/base.txt
# asgiref
# pydata-sphinx-theme
urllib3==2.0.4
urllib3==2.0.7
# via requests
zipp==3.16.2
zipp==3.17.0
# via importlib-metadata
14 changes: 9 additions & 5 deletions requirements/pip-tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
#
# make upgrade
#
build==0.10.0
build==1.0.3
# via pip-tools
click==8.1.6
click==8.1.7
# via pip-tools
packaging==23.1
importlib-metadata==6.8.0
# via build
pip-tools==7.2.0
packaging==23.2
# via build
pip-tools==7.3.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
Expand All @@ -19,8 +21,10 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.1
wheel==0.41.2
# 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
6 changes: 3 additions & 3 deletions requirements/pip.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.41.1
wheel==0.41.2
# 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.0.0
setuptools==68.2.2
# via -r requirements/pip.in
Loading

0 comments on commit f14e74a

Please sign in to comment.