Merge pull request #206 from openedx/jenkins/zshkoor/tox40-updates-7e…

…57a79 fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
openedx · Oct 30, 2023 · 3977ce8 · 3977ce8
2 parents 7e57a79 + b52a875
commit 3977ce8
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 50 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -47,13 +47,13 @@ jinja2==3.1.2
     # via code-annotations
 markupsafe==2.1.3
     # via jinja2
-newrelic==9.1.0
+newrelic==9.1.1
     # via edx-django-utils
 openedx-events==9.0.0
     # via -r requirements/base.in
 pbr==5.11.1
     # via stevedore
-psutil==5.9.5
+psutil==5.9.6
     # via edx-django-utils
 pycparser==2.21
     # via cffi

diff --git a/requirements/dev.in b/requirements/dev.in
@@ -7,4 +7,3 @@
 
 diff-cover                # Changeset diff test coverage
 edx-i18n-tools            # For i18n_tool dummy
-tox-battery               # Makes tox aware of requirements file changes
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
@@ -36,7 +36,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/quality.txt
     #   requests
@@ -59,18 +59,21 @@ code-annotations==1.5.0
     #   edx-lint
     #   edx-toggles
 confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/quality.txt
+    # via
+    #   -r requirements/quality.txt
+    #   confluent-kafka
 coverage[toml]==7.3.2
     # via
     #   -r requirements/quality.txt
+    #   coverage
     #   pytest-cov
 cryptography==41.0.4
     # via
     #   -r requirements/quality.txt
     #   secretstorage
 ddt==1.6.0
     # via -r requirements/quality.txt
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/dev.in
 dill==0.3.7
     # via
@@ -115,6 +118,7 @@ edx-lint==5.3.4
 edx-opaque-keys[django]==2.5.1
     # via
     #   -r requirements/quality.txt
+    #   edx-opaque-keys
     #   openedx-events
 edx-toggles==5.1.0
     # via -r requirements/quality.txt
@@ -173,10 +177,6 @@ keyring==24.2.0
     # via
     #   -r requirements/quality.txt
     #   twine
-lazy-object-proxy==1.9.0
-    # via
-    #   -r requirements/quality.txt
-    #   astroid
 lxml==4.9.3
     # via edx-i18n-tools
 markdown-it-py==3.0.0
@@ -199,7 +199,7 @@ more-itertools==10.1.0
     # via
     #   -r requirements/quality.txt
     #   jaraco-classes
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
@@ -244,15 +244,15 @@ pluggy==1.3.0
     #   tox
 polib==1.2.0
     # via edx-i18n-tools
-psutil==5.9.5
+psutil==5.9.6
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
 py==1.11.0
     # via
     #   -r requirements/ci.txt
     #   tox
-pycodestyle==2.11.0
+pycodestyle==2.11.1
     # via -r requirements/quality.txt
 pycparser==2.21
     # via
@@ -266,7 +266,7 @@ pygments==2.16.1
     #   diff-cover
     #   readme-renderer
     #   rich
-pylint==2.17.7
+pylint==3.0.2
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -277,7 +277,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
@@ -390,9 +390,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/dev.in
 twine==4.0.2
     # via -r requirements/quality.txt
 typing-extensions==4.8.0
@@ -403,7 +400,7 @@ typing-extensions==4.8.0
     #   edx-opaque-keys
     #   pylint
     #   rich
-urllib3==2.0.6
+urllib3==2.0.7
     # via
     #   -r requirements/quality.txt
     #   requests
@@ -416,10 +413,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
@@ -37,7 +37,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
@@ -51,10 +51,13 @@ code-annotations==1.5.0
     #   -r requirements/test.txt
     #   edx-toggles
 confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/test.txt
+    # via
+    #   -r requirements/test.txt
+    #   confluent-kafka
 coverage[toml]==7.3.2
     # via
     #   -r requirements/test.txt
+    #   coverage
     #   pytest-cov
 cryptography==41.0.4
     # via secretstorage
@@ -95,6 +98,7 @@ edx-django-utils==5.7.0
 edx-opaque-keys[django]==2.5.1
     # via
     #   -r requirements/test.txt
+    #   edx-opaque-keys
     #   openedx-events
 edx-toggles==5.1.0
     # via -r requirements/test.txt
@@ -148,7 +152,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
@@ -173,7 +177,7 @@ pluggy==1.3.0
     # via
     #   -r requirements/test.txt
     #   pytest
-psutil==5.9.5
+psutil==5.9.6
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -297,7 +301,7 @@ typing-extensions==4.8.0
     #   edx-opaque-keys
     #   pydata-sphinx-theme
     #   rich
-urllib3==2.0.6
+urllib3==2.0.7
     # via
     #   -r requirements/test.txt
     #   requests

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
@@ -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
@@ -29,7 +29,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
@@ -48,10 +48,13 @@ code-annotations==1.5.0
     #   edx-lint
     #   edx-toggles
 confluent-kafka[avro,schema-registry]==2.2.0
-    # via -r requirements/test.txt
+    # via
+    #   -r requirements/test.txt
+    #   confluent-kafka
 coverage[toml]==7.3.2
     # via
     #   -r requirements/test.txt
+    #   coverage
     #   pytest-cov
 cryptography==41.0.4
     # via secretstorage
@@ -89,6 +92,7 @@ edx-lint==5.3.4
 edx-opaque-keys[django]==2.5.1
     # via
     #   -r requirements/test.txt
+    #   edx-opaque-keys
     #   openedx-events
 edx-toggles==5.1.0
     # via -r requirements/test.txt
@@ -131,8 +135,6 @@ jinja2==3.1.2
     #   code-annotations
 keyring==24.2.0
     # via twine
-lazy-object-proxy==1.9.0
-    # via astroid
 markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.3
@@ -145,7 +147,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
@@ -169,11 +171,11 @@ pluggy==1.3.0
     # via
     #   -r requirements/test.txt
     #   pytest
-psutil==5.9.5
+psutil==5.9.6
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
-pycodestyle==2.11.0
+pycodestyle==2.11.1
     # via -r requirements/quality.in
 pycparser==2.21
     # via
@@ -185,15 +187,15 @@ pygments==2.16.1
     # via
     #   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.4
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -280,13 +282,11 @@ typing-extensions==4.8.0
     #   edx-opaque-keys
     #   pylint
     #   rich
-urllib3==2.0.6
+urllib3==2.0.7
     # via
     #   -r requirements/test.txt
     #   requests
     #   twine
-wrapt==1.15.0
-    # via astroid
 zipp==3.17.0
     # via
     #   importlib-metadata

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -20,7 +20,7 @@ cffi==1.16.0
     # via
     #   -r requirements/base.txt
     #   pynacl
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via requests
 click==8.1.7
     # via
@@ -35,7 +35,9 @@ code-annotations==1.5.0
 confluent-kafka[avro,schema-registry]==2.2.0
     # via -r requirements/test.in
 coverage[toml]==7.3.2
-    # via pytest-cov
+    # via
+    #   coverage
+    #   pytest-cov
 ddt==1.6.0
     # via -r requirements/test.in
     # via
@@ -63,6 +65,7 @@ edx-django-utils==5.7.0
 edx-opaque-keys[django]==2.5.1
     # via
     #   -r requirements/base.txt
+    #   edx-opaque-keys
     #   openedx-events
 edx-toggles==5.1.0
     # via -r requirements/base.txt
@@ -85,7 +88,7 @@ markupsafe==2.1.3
     # via
     #   -r requirements/base.txt
     #   jinja2
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/base.txt
     #   edx-django-utils
@@ -99,7 +102,7 @@ pbr==5.11.1
     #   stevedore
 pluggy==1.3.0
     # via pytest
-psutil==5.9.5
+psutil==5.9.6
     # via
     #   -r requirements/base.txt
     #   edx-django-utils
@@ -160,5 +163,5 @@ typing-extensions==4.8.0
     #   -r requirements/base.txt
     #   asgiref
     #   edx-opaque-keys
-urllib3==2.0.6
+urllib3==2.0.7
     # via requests
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@

		diff-cover # Changeset diff test coverage
		edx-i18n-tools # For i18n_tool dummy
		tox-battery # Makes tox aware of requirements file changes