Merge pull request #1933 from openedx/zshkoor/tox-updates

Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
openedx · Oct 31, 2023 · 9f0c3f5 · 9f0c3f5
2 parents c54ae9e + c51d162
commit 9f0c3f5
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 @@
 -c constraints.txt
 
 tox                       # Virtualenv management for tests
-tox-battery==0.6.1        # Makes tox aware of requirements file changes
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -27,8 +27,5 @@ tox==3.28.0
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/ci.in
-    #   tox-battery
-tox-battery==0.6.1
-    # via -r requirements/ci.in
 virtualenv==20.24.5
     # via tox
diff --git a/requirements/dev.in b/requirements/dev.in
@@ -14,6 +14,5 @@ pycodestyle               # PEP 8 compliance validation
 pydocstyle                # PEP 257 compliance validation
 testfixtures              # Mock objects for unit tests and doc tests
 tox                       # virtualenv management for tests
-tox-battery==0.6.1        # Makes tox aware of requirements file changes (it's experimental, so keep it pinned)
 twine==1.11.0             # Utility for PyPI package uploads
 wheel                     # For generation of wheels for PyPI
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -877,9 +877,6 @@ tox==3.28.0
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/dev.in
-    #   tox-battery
-tox-battery==0.6.1
-    # via -r requirements/dev.in
 tqdm==4.66.1
     # via
     #   -r requirements/doc.txt

diff --git a/tox.ini b/tox.ini
@@ -37,7 +37,7 @@ commands =
 setenv = 
     DJANGO_SETTINGS_MODULE = enterprise.settings.test
     PYTHONPATH = {toxinidir}
-whitelist_externals = 
+allowlist_externals = 
     make
     rm
 deps = 
@@ -65,7 +65,7 @@ commands =
 [testenv:quality]
 setenv = 
     DJANGO_SETTINGS_MODULE = enterprise.settings.test
-whitelist_externals = 
+allowlist_externals = 
     make
     rm
     touch
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@
		-c constraints.txt

		tox # Virtualenv management for tests
		tox-battery==0.6.1 # Makes tox aware of requirements file changes