Skip to content

Commit

Permalink
Merge pull request #162 from openedx/jenkins/zshkoor/tox40-updates-6f…
Browse files Browse the repository at this point in the history
…38984

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq committed Oct 30, 2023
2 parents 6f38984 + 611da00 commit c50398d
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 34 deletions.
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

codecov # Code coverage reporting
tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
7 changes: 2 additions & 5 deletions requirements/ci.txt
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.3.0
charset-normalizer==3.3.1
# via requests
codecov==2.1.13
# via -r requirements/ci.in
Expand Down Expand Up @@ -38,10 +38,7 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
urllib3==2.0.6
urllib3==2.0.7
# via requests
virtualenv==20.24.5
# via tox
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ diff-cover # Changeset diff test coverage
edx-lint # For updating pylintrc
edx-i18n-tools # For i18n_tool dummy
tox # virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
twine # Utility for PyPI package uploads
wheel # For generation of wheels for PyPI
21 changes: 7 additions & 14 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
asgiref==3.7.2
# via django
astroid==2.15.8
astroid==3.0.1
# via
# pylint
# pylint-celery
Expand All @@ -18,7 +18,7 @@ cffi==1.16.0
# via cryptography
chardet==5.2.0
# via diff-cover
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand All @@ -31,7 +31,7 @@ code-annotations==1.5.0
# via edx-lint
cryptography==41.0.4
# via secretstorage
diff-cover==7.7.0
diff-cover==8.0.0
# via -r requirements/dev.in
dill==0.3.7
# via pylint
Expand Down Expand Up @@ -79,8 +79,6 @@ jinja2==3.1.2
# diff-cover
keyring==24.2.0
# via twine
lazy-object-proxy==1.9.0
# via astroid
lxml==4.9.3
# via edx-i18n-tools
markdown-it-py==3.0.0
Expand Down Expand Up @@ -117,7 +115,7 @@ polib==1.2.0
# via edx-i18n-tools
py==1.11.0
# via tox
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
# via cffi
Expand All @@ -128,15 +126,15 @@ pygments==2.16.1
# diff-cover
# readme-renderer
# rich
pylint==2.17.7
pylint==3.0.2
# via
# edx-lint
# pylint-celery
# pylint-django
# pylint-plugin-utils
pylint-celery==0.3
# via edx-lint
pylint-django==2.5.3
pylint-django==2.5.4
# via edx-lint
pylint-plugin-utils==0.8.2
# via
Expand Down Expand Up @@ -188,9 +186,6 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/dev.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/dev.in
twine==4.0.2
# via
# -r requirements/dev.in
Expand All @@ -201,16 +196,14 @@ typing-extensions==4.8.0
# astroid
# pylint
# rich
urllib3==2.0.6
urllib3==2.0.7
# via
# requests
# twine
virtualenv==20.24.5
# via tox
wheel==0.41.2
# via -r requirements/dev.in
wrapt==1.15.0
# via astroid
zipp==3.17.0
# via
# importlib-metadata
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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.2.2
# via -r requirements/pip.in
16 changes: 6 additions & 10 deletions requirements/quality.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
# pylint
# pylint-celery
Expand All @@ -14,7 +14,7 @@ certifi==2023.7.22
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand Down Expand Up @@ -56,8 +56,6 @@ jinja2==3.1.2
# via code-annotations
keyring==24.2.0
# via twine
lazy-object-proxy==1.9.0
# via astroid
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
Expand All @@ -78,7 +76,7 @@ pkginfo==1.9.6
# via twine
platformdirs==3.11.0
# via pylint
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
# via cffi
Expand All @@ -88,15 +86,15 @@ pygments==2.16.1
# via
# readme-renderer
# rich
pylint==2.17.7
pylint==3.0.2
# via
# edx-lint
# pylint-celery
# pylint-django
# pylint-plugin-utils
pylint-celery==0.3
# via edx-lint
pylint-django==2.5.3
pylint-django==2.5.4
# via edx-lint
pylint-plugin-utils==0.8.2
# via
Expand Down Expand Up @@ -142,12 +140,10 @@ typing-extensions==4.8.0
# astroid
# pylint
# rich
urllib3==2.0.6
urllib3==2.0.7
# via
# requests
# twine
wrapt==1.15.0
# via astroid
zipp==3.17.0
# via
# importlib-metadata
Expand Down
4 changes: 3 additions & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
asgiref==3.7.2
# via django
coverage[toml]==7.3.2
# via pytest-cov
# via
# coverage
# pytest-cov
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ commands =
setenv =
DJANGO_SETTINGS_MODULE = test_settings
PYTHONPATH = .
whitelist_externals =
allowlist_externals =
make
rm
touch
Expand Down

0 comments on commit c50398d

Please sign in to comment.