Skip to content

Commit

Permalink
Merge pull request #1160 from openedx/jenkins/zshkoor/tox40-updates-2…
Browse files Browse the repository at this point in the history
…3b8d2f

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq authored Oct 30, 2023
2 parents 5525cd7 + 3cc1ce1 commit df7646d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 14 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 @@

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.6
# 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
3 changes: 0 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -159,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 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 df7646d

Please sign in to comment.