Merge pull request #80 from openedx/jenkins/zshkoor/tox40-updates-3b1…

…d3e5 fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
openedx · Oct 30, 2023 · 3779b03 · 3779b03
2 parents 3b1d3e5 + f330209
commit 3779b03
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 27 deletions.
diff --git a/requirements/ci.in b/requirements/ci.in
@@ -2,4 +2,3 @@
 -c constraints.txt
 
 tox                       # Virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -26,8 +26,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.2
-    # via -r requirements/ci.in
 virtualenv==20.24.5
     # via tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -8,7 +8,7 @@ asgiref==3.7.2
     # via
     #   -r requirements/quality.txt
     #   django
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -82,10 +82,6 @@ jinja2==3.1.2
     # via
     #   -r requirements/quality.txt
     #   code-annotations
-lazy-object-proxy==1.9.0
-    # via
-    #   -r requirements/quality.txt
-    #   astroid
 markupsafe==2.1.3
     # via
     #   -r requirements/quality.txt
@@ -128,7 +124,7 @@ pycodestyle==2.11.1
     # via -r requirements/quality.txt
 pydocstyle==6.3.0
     # via -r requirements/quality.txt
-pylint==2.17.7
+pylint==3.0.2
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -139,7 +135,7 @@ pylint-celery==0.3
     # via
     #   -r requirements/quality.txt
     #   edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.4
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -220,9 +216,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.2
-    # via -r requirements/ci.txt
 typing-extensions==4.8.0
     # via
     #   -r requirements/quality.txt
@@ -238,10 +231,6 @@ wheel==0.41.2
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-wrapt==1.15.0
-    # via
-    #   -r requirements/quality.txt
-    #   astroid
 zipp==3.17.0
     # via
     #   -r requirements/pip-tools.txt

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -8,7 +8,7 @@ wheel==0.41.2
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.3
+pip==23.3.1
     # via -r requirements/pip.in
 setuptools==68.2.2
     # via -r requirements/pip.in
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -8,7 +8,7 @@ asgiref==3.7.2
     # via
     #   -r requirements/test.txt
     #   django
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
@@ -58,8 +58,6 @@ jinja2==3.1.2
     # via
     #   -r requirements/test.txt
     #   code-annotations
-lazy-object-proxy==1.9.0
-    # via astroid
 markupsafe==2.1.3
     # via
     #   -r requirements/test.txt
@@ -84,15 +82,15 @@ pycodestyle==2.11.1
     # via -r requirements/quality.in
 pydocstyle==6.3.0
     # via -r requirements/quality.in
-pylint==2.17.7
+pylint==3.0.2
     # via
     #   edx-lint
     #   pylint-celery
     #   pylint-django
     #   pylint-plugin-utils
 pylint-celery==0.3
     # via edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.4
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -157,5 +155,3 @@ typing-extensions==4.8.0
     #   astroid
     #   edx-opaque-keys
     #   pylint
-wrapt==1.15.0
-    # via astroid
diff --git a/tox.ini b/tox.ini
@@ -15,7 +15,7 @@ commands =
     coverage xml
 
 [testenv:quality]
-whitelist_externals = 
+allowlist_externals = 
     make
 deps = 
     -r{toxinidir}/requirements/quality.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@
		-c constraints.txt

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