Merge pull request #188 from openedx/jenkins/zshkoor/tox40-updates-c3…

…5fa23 fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
openedx · Oct 30, 2023 · 71104ee · 71104ee
2 parents 14f72dc + 14d2adc
commit 71104ee
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 35 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
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    make upgrade
@@ -26,8 +26,5 @@ tox==3.28.0
     # via
     #   -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
@@ -8,7 +8,6 @@
 edx-lint                  # edX pylint rules and plugins
 diff-cover                # Changeset diff test coverage
 edx-i18n-tools            # For i18n_tool dummy
-tox-battery               # Makes tox aware of requirements file changes
 pycodestyle               # PEP 8 compliance validation
 pydocstyle                # PEP 257 compliance validation
 isort                     # to standardize order of imports
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    make upgrade
@@ -43,11 +43,11 @@ billiard==3.6.4.0
     # via
     #   -r requirements/test.txt
     #   celery
-boto3==1.28.66
+boto3==1.28.68
     # via
     #   -r requirements/test.txt
     #   django-ses
-botocore==1.31.66
+botocore==1.31.68
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -70,7 +70,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/test.txt
     #   aiohttp
@@ -227,7 +227,7 @@ multidict==6.0.4
     #   -r requirements/test.txt
     #   aiohttp
     #   yarl
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -387,7 +387,7 @@ stevedore==5.1.0
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via -r requirements/test.txt
 text-unidecode==1.3
     # via
@@ -408,11 +408,6 @@ tox==3.28.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/ci.txt
-    #   tox-battery
-tox-battery==0.6.1
-    # via
-    #   -r requirements/ci.txt
-    #   -r requirements/dev.in
 tqdm==4.66.1
     # via
     #   -r requirements/test.txt
@@ -426,6 +421,7 @@ typing-extensions==4.8.0
     #   -r requirements/test.txt
     #   asgiref
     #   edx-opaque-keys
+    #   faker
 urllib3==1.26.18
     # via
     #   -r requirements/test.txt

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    make upgrade
@@ -49,11 +49,11 @@ billiard==3.6.4.0
     # via
     #   -r requirements/test.txt
     #   celery
-boto3==1.28.66
+boto3==1.28.68
     # via
     #   -r requirements/test.txt
     #   django-ses
-botocore==1.31.66
+botocore==1.31.68
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -71,8 +71,9 @@ certifi==2023.7.22
 cffi==1.16.0
     # via
     #   -r requirements/test.txt
+    #   cryptography
     #   pynacl
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   -r requirements/test.txt
     #   aiohttp
@@ -89,6 +90,8 @@ coverage[toml]==7.3.2
     #   -r requirements/test.txt
     #   coverage
     #   pytest-cov
+cryptography==41.0.4
+    # via secretstorage
 ddt==1.6.0
     # via -r requirements/test.txt
 django==3.2.22
@@ -179,12 +182,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
@@ -218,7 +227,7 @@ multidict==6.0.4
     #   -r requirements/test.txt
     #   aiohttp
     #   yarl
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -298,6 +307,7 @@ python-slugify==8.0.1
 pytz==2023.3.post1
     # via
     #   -r requirements/test.txt
+    #   babel
     #   celery
     #   django
     #   django-ses
@@ -334,6 +344,8 @@ s3transfer==0.7.0
     # via
     #   -r requirements/test.txt
     #   boto3
+secretstorage==3.3.3
+    # via keyring
 six==1.16.0
     # via
     #   -r requirements/test.txt
@@ -388,7 +400,7 @@ stevedore==5.1.0
     #   doc8
     #   edx-django-utils
     #   edx-opaque-keys
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via -r requirements/test.txt
 text-unidecode==1.3
     # via
@@ -417,7 +429,9 @@ typing-extensions==4.8.0
     #   -r requirements/test.txt
     #   asgiref
     #   edx-opaque-keys
+    #   faker
     #   pydata-sphinx-theme
+    #   rich
 urllib3==1.26.18
     # via
     #   -r requirements/test.txt
@@ -435,4 +449,6 @@ yarl==1.9.2
     #   -r requirements/test.txt
     #   aiohttp
 zipp==3.17.0
-    # via importlib-metadata
+    # via
+    #   importlib-metadata
+    #   importlib-resources
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    make upgrade

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    make upgrade
@@ -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/test.txt b/requirements/test.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    make upgrade
@@ -26,9 +26,9 @@ beautifulsoup4==4.12.2
     # via -r requirements/base.in
 billiard==3.6.4.0
     # via celery
-boto3==1.28.66
+boto3==1.28.68
     # via django-ses
-botocore==1.31.66
+botocore==1.31.68
     # via
     #   boto3
     #   s3transfer
@@ -40,7 +40,7 @@ certifi==2023.7.22
     # via requests
 cffi==1.16.0
     # via pynacl
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   aiohttp
     #   requests
@@ -133,7 +133,7 @@ multidict==6.0.4
     # via
     #   aiohttp
     #   yarl
-newrelic==9.1.0
+newrelic==9.1.1
     # via edx-django-utils
 openai==0.28.1
     # via -r requirements/base.in
@@ -204,7 +204,7 @@ stevedore==5.1.0
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via -r requirements/test.in
 text-unidecode==1.3
     # via python-slugify
@@ -220,6 +220,7 @@ typing-extensions==4.8.0
     # via
     #   asgiref
     #   edx-opaque-keys
+    #   faker
 urllib3==1.26.18
     # via
     #   botocore

diff --git a/tox.ini b/tox.ini
@@ -51,7 +51,7 @@ commands =
     pytest {posargs}
 
 [testenv:quality]
-whitelist_externals =
+allowlist_externals =
     make
     rm
     touch
@@ -82,7 +82,7 @@ commands =
 [testenv:docs]
 setenv =
     PYTHONPATH = {toxinidir}
-whitelist_externals =
+allowlist_externals =
     make
     rm
 deps =