Skip to content

Commit

Permalink
fix: Replaced whitelist_externals with allowlist_externals in tox and…
Browse files Browse the repository at this point in the history
… removed tox-battery
  • Loading branch information
edx-requirements-bot committed Oct 23, 2023
1 parent 23b8d2f commit 59d3ad8
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 35 deletions.
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand Down Expand Up @@ -125,7 +125,7 @@ markupsafe==2.1.3
# via
# mako
# xblock
newrelic==9.1.0
newrelic==9.1.1
# via edx-django-utils
pbr==5.11.1
# via stevedore
Expand Down Expand Up @@ -197,7 +197,7 @@ tzdata==2023.3
# via
# backports-zoneinfo
# celery
urllib3==2.0.6
urllib3==2.0.7
# via requests
vine==5.0.0
# via
Expand Down
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 @@

coverage # Base coverage for codecov
tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
3 changes: 0 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,5 @@ 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
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 @@ -7,7 +7,6 @@ diff-cover # Changeset diff test coverage
edx_lint # Python code linting rules
edx-i18n-tools # For i18n_tool dummy
tox # virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
wheel # For generation of wheels for PyPI
path.py
django
13 changes: 3 additions & 10 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ annotated-types==0.6.0
# via pydantic
asgiref==3.7.2
# via django
astroid==2.15.8
astroid==3.0.1
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -63,8 +63,6 @@ jinja2==3.1.2
# via
# code-annotations
# diff-cover
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 @@ -109,15 +107,15 @@ pygments==2.16.1
# via
# diff-cover
# 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 @@ -161,9 +159,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
typer[all]==0.9.0
# via
# rstcheck
Expand All @@ -184,7 +179,5 @@ 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
10 changes: 3 additions & 7 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ annotated-types==0.6.0
# via pydantic
asgiref==3.7.2
# via django
astroid==2.15.8
astroid==3.0.1
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -45,8 +45,6 @@ isort==5.12.0
# pylint
jinja2==3.1.2
# via code-annotations
lazy-object-proxy==1.9.0
# via astroid
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
Expand All @@ -69,15 +67,15 @@ pydocstyle==6.3.0
# via -r requirements/quality.in
pygments==2.16.1
# via 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 @@ -127,7 +125,5 @@ typing-extensions==4.8.0
# rstcheck
# rstcheck-core
# typer
wrapt==1.15.0
# via astroid
zipp==3.17.0
# via importlib-metadata
8 changes: 4 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
# via
# -c requirements/constraints.txt
Expand Down Expand Up @@ -157,7 +157,7 @@ mock==5.1.0
# via -r requirements/test.in
mypy-extensions==1.0.0
# via logilab-common
newrelic==9.1.0
newrelic==9.1.1
# via edx-django-utils
packaging==23.2
# via pytest
Expand Down Expand Up @@ -254,7 +254,7 @@ stevedore==5.1.0
# code-annotations
# edx-django-utils
# edx-opaque-keys
testfixtures==7.2.0
testfixtures==7.2.2
# via -r requirements/test.in
text-unidecode==1.3
# via python-slugify
Expand All @@ -274,7 +274,7 @@ tzdata==2023.3
# via
# backports-zoneinfo
# celery
urllib3==2.0.6
urllib3==2.0.7
# via
# requests
# responses
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ commands =
python -Wd -m pytest {posargs:-n 3}

[testenv:js_tests]
whitelist_externals =
allowlist_externals =
npm
make
commands =
Expand All @@ -27,7 +27,7 @@ commands =
make test-js

[testenv:js_lint]
whitelist_externals =
allowlist_externals =
npm
make
commands =
Expand All @@ -36,15 +36,15 @@ commands =
make lint-js

[testenv:rst_validation]
whitelist_externals =
allowlist_externals =
make
deps =
-r{toxinidir}/requirements/quality.txt
commands =
make quality-rst

[testenv:quality]
whitelist_externals =
allowlist_externals =
make
rm
touch
Expand All @@ -63,7 +63,7 @@ commands =
{toxinidir}/edx_proctoring/scripts/version_check.py

[testenv:pii_check]
whitelist_externals =
allowlist_externals =
make
deps =
-r{toxinidir}/requirements/test.txt
Expand All @@ -72,7 +72,7 @@ commands =
make pii_check

[testenv:translations]
whitelist_externals =
allowlist_externals =
make
deps =
django32: Django>=3.2,<3.3
Expand Down

0 comments on commit 59d3ad8

Please sign in to comment.