Skip to content

Commit

Permalink
Merge pull request #257 from openedx/jenkins/zshkoor/tox40-updates-05…
Browse files Browse the repository at this point in the history
…f8e82

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq authored Oct 30, 2023
2 parents 48e938d + 4e4422f commit 5e5177e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 10 deletions.
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@

mock # Mock library for running tests
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/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 @@ -10,4 +10,3 @@ edx-lint # For updating pylintrc
edx-i18n-tools # For i18n_tool dummy
pip-tools # Requirements file management
tox # virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
3 changes: 0 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,6 @@ tox==3.28.0
# via
# -c requirements/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/quality.in
typing-extensions==4.8.0
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ commands =
setenv =
DJANGO_SETTINGS_MODULE = completion.settings.test_settings
PYTHONPATH = {toxinidir}
whitelist_externals =
allowlist_externals =
make
rm
deps =
Expand All @@ -46,7 +46,7 @@ commands =
[testenv:quality]
setenv =
DJANGO_SETTINGS_MODULE=completion.settings.test_settings
whitelist_externals =
allowlist_externals =
make
rm
touch
Expand Down

0 comments on commit 5e5177e

Please sign in to comment.