Merge pull request #70 from edx/jenkins/zshkoor/tox40-updates-0875b70

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
edx · Nov 10, 2023 · c80ccdc · c80ccdc
2 parents 0875b70 + ea5388b
commit c80ccdc
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 57 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -14,7 +14,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
@@ -47,7 +47,7 @@ edx-django-utils==5.7.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
-edx-drf-extensions==8.10.0
+edx-drf-extensions==8.12.0
     # via -r requirements/base.in
 edx-opaque-keys==2.5.1
     # via
@@ -65,18 +65,19 @@ markupsafe==2.1.3
     # via
     #   mako
     #   xblock
-newrelic==9.1.0
+newrelic==9.1.1
     # via edx-django-utils
 pbr==5.11.1
     # via stevedore
-psutil==5.9.5
+psutil==5.9.6
     # via edx-django-utils
 pycparser==2.21
     # via cffi
 pyjwt[crypto]==2.8.0
     # via
     #   drf-jwt
     #   edx-drf-extensions
+    #   pyjwt
 pymongo==3.13.0
     # via edx-opaque-keys
 pynacl==1.5.0
@@ -110,7 +111,7 @@ typing-extensions==4.8.0
     # via
     #   asgiref
     #   edx-opaque-keys
-urllib3==2.0.6
+urllib3==2.0.7
     # via requests
 web-fragments==2.1.0
     # via xblock

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 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
@@ -12,7 +12,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
@@ -32,7 +32,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
@@ -56,14 +56,15 @@ code-annotations==1.5.0
 coverage[toml]==7.3.2
     # via
     #   -r requirements/quality.txt
+    #   coverage
     #   pytest-cov
 cryptography==41.0.4
     # via
     #   -r requirements/quality.txt
     #   pyjwt
 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
@@ -106,7 +107,7 @@ edx-django-utils==5.7.0
     # via
     #   -r requirements/quality.txt
     #   edx-drf-extensions
-edx-drf-extensions==8.10.0
+edx-drf-extensions==8.12.0
     # via -r requirements/quality.txt
 edx-i18n-tools==1.3.0
     # via -r requirements/dev.in
@@ -150,10 +151,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
     #   -r requirements/quality.txt
@@ -173,7 +170,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
@@ -208,15 +205,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
@@ -231,7 +228,8 @@ pyjwt[crypto]==2.8.0
     #   -r requirements/quality.txt
     #   drf-jwt
     #   edx-drf-extensions
-pylint==2.17.7
+    #   pyjwt
+pylint==3.0.2
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -242,7 +240,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
@@ -350,17 +348,14 @@ 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
     #   asgiref
     #   astroid
     #   edx-opaque-keys
     #   pylint
-urllib3==2.0.6
+urllib3==2.0.7
     # via
     #   -r requirements/quality.txt
     #   requests
@@ -380,10 +375,6 @@ wheel==0.41.2
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-wrapt==1.15.0
-    # via
-    #   -r requirements/quality.txt
-    #   astroid
 xblock==1.8.1
     # via -r requirements/quality.txt
 zipp==3.17.0

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -33,7 +33,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
@@ -47,6 +47,7 @@ code-annotations==1.5.0
 coverage[toml]==7.3.2
     # via
     #   -r requirements/test.txt
+    #   coverage
     #   pytest-cov
 cryptography==41.0.4
     # via
@@ -96,7 +97,7 @@ edx-django-utils==5.7.0
     # via
     #   -r requirements/test.txt
     #   edx-drf-extensions
-edx-drf-extensions==8.10.0
+edx-drf-extensions==8.12.0
     # via -r requirements/test.txt
 edx-opaque-keys==2.5.1
     # via
@@ -161,7 +162,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
@@ -184,7 +185,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
@@ -207,6 +208,7 @@ pyjwt[crypto]==2.8.0
     #   -r requirements/test.txt
     #   drf-jwt
     #   edx-drf-extensions
+    #   pyjwt
 pymongo==3.13.0
     # via
     #   -r requirements/test.txt
@@ -333,7 +335,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
@@ -12,7 +12,7 @@ asgiref==3.7.2
     # via
     #   -r requirements/test.txt
     #   django
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
@@ -25,7 +25,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
@@ -45,6 +45,7 @@ code-annotations==1.5.0
 coverage[toml]==7.3.2
     # via
     #   -r requirements/test.txt
+    #   coverage
     #   pytest-cov
 cryptography==41.0.4
     # via
@@ -86,7 +87,7 @@ edx-django-utils==5.7.0
     # via
     #   -r requirements/test.txt
     #   edx-drf-extensions
-edx-drf-extensions==8.10.0
+edx-drf-extensions==8.12.0
     # via -r requirements/test.txt
 edx-lint==5.3.4
     # via -r requirements/quality.in
@@ -118,8 +119,6 @@ jinja2==3.1.2
     # via
     #   -r requirements/test.txt
     #   code-annotations
-lazy-object-proxy==1.9.0
-    # via astroid
 lxml==4.9.3
     # via
     #   -r requirements/test.txt
@@ -136,7 +135,7 @@ markupsafe==2.1.3
     #   xblock
 mccabe==0.7.0
     # via pylint
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -154,11 +153,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
@@ -171,15 +170,16 @@ pyjwt[crypto]==2.8.0
     #   -r requirements/test.txt
     #   drf-jwt
     #   edx-drf-extensions
-pylint==2.17.7
+    #   pyjwt
+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
@@ -270,7 +270,7 @@ typing-extensions==4.8.0
     #   astroid
     #   edx-opaque-keys
     #   pylint
-urllib3==2.0.6
+urllib3==2.0.7
     # via
     #   -r requirements/test.txt
     #   requests
@@ -282,8 +282,6 @@ webob==1.8.7
     # via
     #   -r requirements/test.txt
     #   xblock
-wrapt==1.15.0
-    # via astroid
 xblock==1.8.1
     # via -r requirements/test.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@
		-c constraints.txt

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