fix: Replaced whitelist_externals with allowlist_externals in tox and…

… removed tox-battery
edx · Oct 23, 2023 · 355e916 · 355e916
1 parent 5224f66
commit 355e916
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 53 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -12,7 +12,7 @@ cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via requests
 click==8.1.7
     # via edx-django-utils
@@ -58,7 +58,7 @@ edx-rest-api-client==5.6.1
     # via -r requirements/base.in
 idna==3.4
     # via requests
-newrelic==9.1.0
+newrelic==9.1.1
     # via edx-django-utils
 pbr==5.11.1
     # via stevedore

diff --git a/requirements/ci.in b/requirements/ci.in
@@ -4,4 +4,3 @@
 
 codecov                   # Code coverage reporting
 tox                       # Virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -6,7 +6,7 @@
 #
 certifi==2023.7.22
     # via requests
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via requests
 codecov==2.1.13
     # via -r requirements/ci.in
@@ -38,9 +38,6 @@ 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
 urllib3==2.0.7
     # via requests
 virtualenv==20.24.5

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
@@ -29,7 +29,7 @@ cffi==1.16.0
     #   pynacl
 chardet==5.2.0
     # via diff-cover
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
@@ -156,10 +156,6 @@ jinja2==3.1.2
     #   -r requirements/quality.txt
     #   code-annotations
     #   diff-cover
-lazy-object-proxy==1.9.0
-    # via
-    #   -r requirements/quality.txt
-    #   astroid
 lxml==4.9.3
     # via edx-i18n-tools
 markupsafe==2.1.3
@@ -170,7 +166,7 @@ mccabe==0.7.0
     # via
     #   -r requirements/quality.txt
     #   pylint
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
@@ -230,7 +226,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   pyjwt
-pylint==2.17.7
+pylint==3.0.2
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -241,7 +237,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
@@ -349,9 +345,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
 types-pyyaml==6.0.12.12
     # via
     #   -r requirements/quality.txt
@@ -377,10 +370,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/doc.txt b/requirements/doc.txt
@@ -23,7 +23,7 @@ cffi==1.16.0
     #   -r requirements/test.txt
     #   cryptography
     #   pynacl
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   -r requirements/test.txt
     #   requests
@@ -43,6 +43,7 @@ cryptography==41.0.4
     # via
     #   -r requirements/test.txt
     #   pyjwt
+    #   secretstorage
 ddt==1.6.0
     # via -r requirements/test.txt
 django==3.2.22
@@ -113,12 +114,18 @@ importlib-metadata==6.8.0
     #   keyring
     #   sphinx
     #   twine
+importlib-resources==6.1.0
+    # via keyring
 iniconfig==2.0.0
     # via
     #   -r requirements/test.txt
     #   pytest
 jaraco-classes==3.3.0
     # via keyring
+jeepney==0.8.0
+    # via
+    #   keyring
+    #   secretstorage
 jinja2==3.1.2
     # via
     #   -r requirements/test.txt
@@ -136,7 +143,7 @@ mdurl==0.1.2
     # via markdown-it-py
 more-itertools==10.1.0
     # via jaraco-classes
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -205,6 +212,7 @@ python-slugify==8.0.1
 pytz==2023.3.post1
     # via
     #   -r requirements/test.txt
+    #   babel
     #   django
     #   djangorestframework
 pyyaml==6.0.1
@@ -234,6 +242,8 @@ rfc3986==2.0.0
     # via twine
 rich==13.6.0
     # via twine
+secretstorage==3.3.3
+    # via keyring
 semantic-version==2.10.0
     # via
     #   -r requirements/test.txt
@@ -244,25 +254,19 @@ slumber==0.7.1
     #   edx-rest-api-client
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==7.2.6
-    # via
-    #   -r requirements/doc.in
-    #   sphinxcontrib-applehelp
-    #   sphinxcontrib-devhelp
-    #   sphinxcontrib-htmlhelp
-    #   sphinxcontrib-qthelp
-    #   sphinxcontrib-serializinghtml
-sphinxcontrib-applehelp==1.0.7
+sphinx==7.1.2
+    # via -r requirements/doc.in
+sphinxcontrib-applehelp==1.0.4
     # via sphinx
-sphinxcontrib-devhelp==1.0.5
+sphinxcontrib-devhelp==1.0.2
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.4
+sphinxcontrib-htmlhelp==2.0.1
     # via sphinx
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
-sphinxcontrib-qthelp==1.0.6
+sphinxcontrib-qthelp==1.0.3
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.9
+sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 sqlparse==0.4.4
     # via
@@ -298,11 +302,14 @@ typing-extensions==4.8.0
     #   -r requirements/test.txt
     #   asgiref
     #   edx-opaque-keys
+    #   rich
 urllib3==2.0.7
     # via
     #   -r requirements/test.txt
     #   requests
     #   responses
     #   twine
 zipp==3.17.0
-    # via importlib-metadata
+    # via
+    #   importlib-metadata
+    #   importlib-resources
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
@@ -21,7 +21,7 @@ cffi==1.16.0
     #   -r requirements/test.txt
     #   cryptography
     #   pynacl
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   -r requirements/test.txt
     #   requests
@@ -117,15 +117,13 @@ 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
     #   jinja2
 mccabe==0.7.0
     # via pylint
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -162,15 +160,15 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   pyjwt
-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
@@ -266,5 +264,3 @@ urllib3==2.0.7
     #   -r requirements/test.txt
     #   requests
     #   responses
-wrapt==1.15.0
-    # via astroid
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -17,7 +17,7 @@ cffi==1.16.0
     #   -r requirements/base.txt
     #   cryptography
     #   pynacl
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   -r requirements/base.txt
     #   requests
@@ -93,7 +93,7 @@ jinja2==3.1.2
     # via code-annotations
 markupsafe==2.1.3
     # via jinja2
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/base.txt
     #   edx-django-utils

diff --git a/tox.ini b/tox.ini
@@ -49,7 +49,7 @@ setenv =
     PYTHONPATH = {toxinidir}
     # Adding the option here instead of as a default in the docs Makefile because that Makefile is generated by shpinx.
     SPHINXOPTS = -W
-whitelist_externals =
+allowlist_externals =
     make
     rm
 deps =
@@ -64,7 +64,7 @@ commands =
     twine check dist/*
 
 [testenv:quality]
-whitelist_externals =
+allowlist_externals =
     make
     rm
     touch