Merge pull request #243 from openedx/jenkins/zshkoor/tox40-updates-b3…

…6c5f2 fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
openedx · Oct 26, 2023 · 43dea48 · 43dea48
2 parents b36c5f2 + 1eafbd2
commit 43dea48
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 33 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               # 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 requirements/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.in b/requirements/dev.in
@@ -6,6 +6,5 @@ diff-cover                # Changeset diff test coverage
 edx-i18n-tools            # For i18n_tool dummy
 edx-lint                  # For updating pylintrc
 tox                       # virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
 twine                     # Utility for PyPI package uploads
 wheel                     # For generation of wheels for PyPI
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -6,7 +6,7 @@
 #
 asgiref==3.7.2
     # via django
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
@@ -16,7 +16,7 @@ cffi==1.16.0
     # via cryptography
 chardet==5.2.0
     # via diff-cover
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via requests
 click==8.1.7
     # via
@@ -29,7 +29,7 @@ code-annotations==1.5.0
     # via edx-lint
 cryptography==41.0.4
     # via secretstorage
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/dev.in
 dill==0.3.7
     # via pylint
@@ -75,8 +75,6 @@ jinja2==3.1.2
     #   diff-cover
 keyring==24.2.0
     # via twine
-lazy-object-proxy==1.9.0
-    # via astroid
 lxml==4.9.3
     # via edx-i18n-tools
 markdown-it-py==3.0.0
@@ -111,7 +109,7 @@ polib==1.2.0
     # via edx-i18n-tools
 py==1.11.0
     # via tox
-pycodestyle==2.11.0
+pycodestyle==2.11.1
     # via -r requirements/quality.in
 pycparser==2.21
     # via cffi
@@ -122,15 +120,15 @@ pygments==2.16.1
     #   diff-cover
     #   readme-renderer
     #   rich
-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.5
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -181,9 +179,6 @@ tox==3.28.0
     # via
     #   -c requirements/common_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/dev.in
 typing-extensions==4.8.0
@@ -192,16 +187,14 @@ typing-extensions==4.8.0
     #   astroid
     #   pylint
     #   rich
-urllib3==2.0.6
+urllib3==2.0.7
     # via
     #   requests
     #   twine
 virtualenv==20.24.5
     # via tox
 wheel==0.41.2
     # via -r requirements/dev.in
-wrapt==1.15.0
-    # via astroid
 zipp==3.17.0
     # via
     #   importlib-metadata

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -34,7 +34,7 @@ certifi==2023.7.22
     # via requests
 cffi==1.16.0
     # via cryptography
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via requests
 click==8.1.7
     # via
@@ -204,7 +204,7 @@ tzdata==2023.3
     # via
     #   backports-zoneinfo
     #   celery
-urllib3==2.0.6
+urllib3==2.0.7
     # via
     #   requests
     #   twine

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.2.1
+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
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
@@ -27,8 +27,6 @@ isort==5.12.0
     #   pylint
 jinja2==3.1.2
     # via code-annotations
-lazy-object-proxy==1.9.0
-    # via astroid
 markupsafe==2.1.3
     # via jinja2
 mccabe==0.7.0
@@ -37,19 +35,19 @@ pbr==5.11.1
     # via stevedore
 platformdirs==3.11.0
     # via pylint
-pycodestyle==2.11.0
+pycodestyle==2.11.1
     # via -r requirements/quality.in
 pydocstyle==3.0.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.5
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -77,5 +75,3 @@ typing-extensions==4.8.0
     # via
     #   astroid
     #   pylint
-wrapt==1.15.0
-    # via astroid
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -28,7 +28,9 @@ click-plugins==1.1.1
 click-repl==0.3.0
     # via celery
 coverage[toml]==7.3.2
-    # 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
@@ -30,7 +30,7 @@ commands =
 setenv = 
     DJANGO_SETTINGS_MODULE = test_settings
     PYTHONPATH = {toxinidir}
-whitelist_externals = 
+allowlist_externals = 
     make
     rm
 deps = 
@@ -48,7 +48,7 @@ commands =
 setenv = 
     DJANGO_SETTINGS_MODULE = test_settings
     PYTHONPATH = {toxinidir}
-whitelist_externals = 
+allowlist_externals = 
     make
     rm
     touch