Merge pull request #257 from openedx/jenkins/zshkoor/tox40-updates-05…

…f8e82 fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
openedx · Oct 30, 2023 · 5e5177e · 5e5177e
2 parents 48e938d + 4e4422f
commit 5e5177e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/requirements/ci.in b/requirements/ci.in
@@ -3,4 +3,3 @@
 
 mock                      # Mock library for running tests
 tox                       # Virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -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
diff --git a/requirements/dev.in b/requirements/dev.in
@@ -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
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -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

diff --git a/tox.ini b/tox.ini
@@ -31,7 +31,7 @@ commands =
 setenv = 
     DJANGO_SETTINGS_MODULE = completion.settings.test_settings
     PYTHONPATH = {toxinidir}
-whitelist_externals = 
+allowlist_externals = 
     make
     rm
 deps = 
@@ -46,7 +46,7 @@ commands =
 [testenv:quality]
 setenv = 
     DJANGO_SETTINGS_MODULE=completion.settings.test_settings
-whitelist_externals = 
+allowlist_externals = 
     make
     rm
     touch