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

Replaced whitelist_externals with allowlist_externals in tox and…
openedx · Oct 31, 2023 · 99c3ad4 · 99c3ad4
2 parents c2ffaf5 + bae0819
commit 99c3ad4
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 10 deletions.
diff --git a/requirements/ci.in b/requirements/ci.in
@@ -3,4 +3,3 @@
 
 coverage                  # Calculate code coverage of 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 https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/ci.in
-    #   tox-battery
-tox-battery==0.6.1
-    # via -r requirements/ci.in
 virtualenv==20.24.2
     # via tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -20,6 +20,7 @@ astroid==2.15.6
 backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/quality.txt
+    #   backports-zoneinfo
     #   celery
     #   kombu
 billiard==4.1.0
@@ -86,6 +87,7 @@ coverage[toml]==7.2.7
     # via
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
+    #   coverage
     #   pytest-cov
 ddt==1.6.0
     # via -r requirements/quality.txt
@@ -365,9 +367,6 @@ tox==3.28.0
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/ci.txt
-    #   tox-battery
-tox-battery==0.6.1
-    # via -r requirements/ci.txt
 typing-extensions==4.7.1
     # via
     #   -r requirements/quality.txt

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -23,6 +23,7 @@ babel==2.12.1
 backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/test.txt
+    #   backports-zoneinfo
     #   celery
     #   kombu
 beautifulsoup4==4.12.2
@@ -76,6 +77,7 @@ code-annotations==1.5.0
 coverage[toml]==7.2.7
     # via
     #   -r requirements/test.txt
+    #   coverage
     #   pytest-cov
 ddt==1.6.0
     # via -r requirements/test.txt

diff --git a/requirements/pii_check.txt b/requirements/pii_check.txt
@@ -15,6 +15,7 @@ asgiref==3.7.2
 backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/base.txt
+    #   backports-zoneinfo
     #   celery
     #   kombu
 billiard==4.1.0

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -18,6 +18,7 @@ tomli==2.0.1
     # via
     #   build
     #   pip-tools
+    #   pyproject-hooks
 wheel==0.41.0
     # via pip-tools
 

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -19,6 +19,7 @@ astroid==2.15.6
 backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/test.txt
+    #   backports-zoneinfo
     #   celery
     #   kombu
 billiard==4.1.0
@@ -74,6 +75,7 @@ code-annotations==1.5.0
 coverage[toml]==7.2.7
     # via
     #   -r requirements/test.txt
+    #   coverage
     #   pytest-cov
 ddt==1.6.0
     # via -r requirements/test.txt

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -14,6 +14,7 @@ asgiref==3.7.2
 backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/base.txt
+    #   backports-zoneinfo
     #   celery
     #   kombu
     # via
@@ -59,7 +60,9 @@ click-repl==0.3.0
 code-annotations==1.5.0
     # via -r requirements/test.in
 coverage[toml]==7.2.7
-    # via pytest-cov
+    # via
+    #   coverage
+    #   pytest-cov
 ddt==1.6.0
     # via -r requirements/test.in
     # via

diff --git a/tox.ini b/tox.ini
@@ -21,7 +21,7 @@ commands =
 setenv = 
     DJANGO_SETTINGS_MODULE = test_settings
     PYTHONPATH = {toxinidir}
-whitelist_externals = 
+allowlist_externals = 
     make
     rm
 deps = 
@@ -39,7 +39,7 @@ commands =
 setenv = 
     DJANGO_SETTINGS_MODULE = test_settings
     PYTHONPATH = {toxinidir}/mock_apps/
-whitelist_externals = 
+allowlist_externals = 
     make
     rm
     touch
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@

		coverage # Calculate code coverage of tests.
		tox # Virtualenv management for tests
		tox-battery # Makes tox aware of requirements file changes