Merge pull request #136 from openedx/jenkins/zshkoor/tox40-updates-45…

…de9a2 fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
openedx · Oct 26, 2023 · ec4e717 · ec4e717
2 parents 45de9a2 + c1debd9
commit ec4e717
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 30 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -8,9 +8,9 @@ appdirs==1.4.4
     # via fs
 asgiref==3.7.2
     # via django
-boto3==1.28.62
+boto3==1.28.68
     # via fs-s3fs
-botocore==1.31.62
+botocore==1.31.68
     # via
     #   boto3
     #   s3transfer
@@ -70,7 +70,7 @@ sqlparse==0.4.4
     # via django
 typing-extensions==4.8.0
     # via asgiref
-urllib3==1.26.17
+urllib3==1.26.18
     # via botocore
 web-fragments==2.1.0
     # via

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
 coverage==6.5.0
     # via coveralls
@@ -55,7 +55,7 @@ tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/tox.txt
-urllib3==2.0.6
+urllib3==2.0.7
     # via requests
 virtualenv==20.24.5
     # via

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,16 +12,16 @@ asgiref==3.7.2
     # via
     #   -r requirements/base.txt
     #   django
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   -r requirements/test.txt
     #   pylint
     #   pylint-celery
-boto3==1.28.62
+boto3==1.28.68
     # via
     #   -r requirements/base.txt
     #   fs-s3fs
-botocore==1.31.62
+botocore==1.31.68
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -82,10 +82,6 @@ lazy==1.6
     # via
     #   -r requirements/base.txt
     #   xblock
-lazy-object-proxy==1.9.0
-    # via
-    #   -r requirements/test.txt
-    #   astroid
 lxml==4.9.3
     # via
     #   -r requirements/base.txt
@@ -120,9 +116,9 @@ platformdirs==3.11.0
     # via
     #   -r requirements/test.txt
     #   pylint
-pycodestyle==2.11.0
+pycodestyle==2.11.1
     # via -r requirements/quality.in
-pylint==2.17.7
+pylint==3.0.2
     # via
     #   -r requirements/quality.in
     #   -r requirements/test.txt
@@ -134,7 +130,7 @@ pylint-celery==0.3
     # via
     #   -r requirements/test.txt
     #   edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.4
     # via
     #   -r requirements/test.txt
     #   edx-lint
@@ -213,7 +209,7 @@ typing-extensions==4.8.0
     #   astroid
     #   edx-opaque-keys
     #   pylint
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -r requirements/base.txt
     #   botocore
@@ -226,13 +222,10 @@ webob==1.8.7
     # via
     #   -r requirements/base.txt
     #   xblock
-wrapt==1.15.0
-    # via
-    #   -r requirements/test.txt
-    #   astroid
 xblock[django]==1.8.1
     # via
     #   -r requirements/base.txt
+    #   xblock
     #   xblock-utils
 xblock-utils==4.0.0
     # via -r requirements/base.txt

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
@@ -29,8 +29,6 @@ isort==5.12.0
     # via 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
@@ -41,15 +39,15 @@ pbr==5.11.1
     # via stevedore
 platformdirs==3.11.0
     # via pylint
-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
@@ -78,5 +76,3 @@ typing-extensions==4.8.0
     #   astroid
     #   edx-opaque-keys
     #   pylint
-wrapt==1.15.0
-    # via astroid
diff --git a/tox.ini b/tox.ini
@@ -19,7 +19,7 @@ deps =
 skip_install = True
 
 [testenv:csslint]
-whitelist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
+allowlist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 commands = 
     make requirements_js
@@ -28,7 +28,7 @@ deps =
 skip_install = True
 
 [testenv:eslint]
-whitelist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
+allowlist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 commands = 
     make requirements_js