From e6493650e323fb35c779d657289cb8bc5674893a Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 23 Oct 2023 09:17:15 -0400 Subject: [PATCH] fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery --- .../requirements/ci.in | 1 - .../requirements/ci.in | 1 - .../requirements/ci.in | 1 - .../requirements/dev.in | 1 - .../requirements/pip.txt | 2 +- requirements/base.txt | 14 ++++------- requirements/dev.in | 1 - requirements/dev.txt | 23 +++++-------------- requirements/pip.txt | 2 +- requirements/test.txt | 20 +++++----------- tox.ini | 2 +- 11 files changed, 20 insertions(+), 48 deletions(-) diff --git a/cookiecutter-django-app/{{cookiecutter.repo_name}}/requirements/ci.in b/cookiecutter-django-app/{{cookiecutter.repo_name}}/requirements/ci.in index 37978497..3586cbe3 100644 --- a/cookiecutter-django-app/{{cookiecutter.repo_name}}/requirements/ci.in +++ b/cookiecutter-django-app/{{cookiecutter.repo_name}}/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/cookiecutter-django-ida/{{cookiecutter.repo_name}}/requirements/ci.in b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/requirements/ci.in index 37978497..3586cbe3 100644 --- a/cookiecutter-django-ida/{{cookiecutter.repo_name}}/requirements/ci.in +++ b/cookiecutter-django-ida/{{cookiecutter.repo_name}}/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/cookiecutter-xblock/{{cookiecutter.repo_name}}/requirements/ci.in b/cookiecutter-xblock/{{cookiecutter.repo_name}}/requirements/ci.in index 37978497..3586cbe3 100644 --- a/cookiecutter-xblock/{{cookiecutter.repo_name}}/requirements/ci.in +++ b/cookiecutter-xblock/{{cookiecutter.repo_name}}/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/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/dev.in b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/dev.in index 497f296e..3e059845 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/dev.in +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/dev.in @@ -6,4 +6,3 @@ -r ci.txt # dependencies needed to setup testing environment on CI diff-cover # Changeset diff test coverage -tox-battery # Makes tox aware of requirements file changes diff --git a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.txt b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.txt index 0bda5ade..57019f96 100644 --- a/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.txt +++ b/python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.41.2 # via -r python-template/{{cookiecutter.placeholder_repo_name}}/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 python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.in setuptools==68.2.2 # via -r python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.in diff --git a/requirements/base.txt b/requirements/base.txt index bf861a13..2a5f43ce 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,7 @@ # arrow==1.3.0 # via cookiecutter -astroid==2.15.8 +astroid==3.0.1 # via # pylint # pylint-celery @@ -16,7 +16,7 @@ certifi==2023.7.22 # via requests chardet==5.2.0 # via binaryornot -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via requests click==8.1.7 # via @@ -42,8 +42,6 @@ jinja2==3.1.2 # via # code-annotations # cookiecutter -lazy-object-proxy==1.9.0 - # via astroid markdown-it-py==3.0.0 # via rich markupsafe==2.1.3 @@ -58,7 +56,7 @@ platformdirs==3.11.0 # via pylint pygments==2.16.1 # via rich -pylint==2.17.7 +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -66,7 +64,7 @@ pylint==2.17.7 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via edx-lint pylint-plugin-utils==0.8.2 # via @@ -105,7 +103,5 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==2.0.6 +urllib3==2.0.7 # via requests -wrapt==1.15.0 - # via astroid diff --git a/requirements/dev.in b/requirements/dev.in index e747158c..c9805e18 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -5,4 +5,3 @@ -r test.txt # Dependencies for testing and quality checks -r ci.txt # tox and associated dependencies -tox-battery # Makes tox aware of requirements file changes diff --git a/requirements/dev.txt b/requirements/dev.txt index 0c9e003f..728d6979 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -20,7 +20,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.8 +astroid==3.0.1 # via # -r requirements/test.txt # pylint @@ -55,7 +55,7 @@ chardet==5.2.0 # via # -r requirements/test.txt # binaryornot -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/test.txt # requests @@ -172,10 +172,6 @@ keyring==24.2.0 # via # -r requirements/test.txt # twine -lazy-object-proxy==1.9.0 - # via - # -r requirements/test.txt - # astroid markdown-it-py==3.0.0 # via # -r requirements/test.txt @@ -236,7 +232,7 @@ py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via -r requirements/test.txt pycparser==2.21 # via @@ -257,7 +253,7 @@ pygments==2.16.1 # readme-renderer # rich # sphinx -pylint==2.17.7 +pylint==3.0.2 # via # -r requirements/test.txt # edx-lint @@ -268,7 +264,7 @@ pylint-celery==0.3 # via # -r requirements/test.txt # edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via # -r requirements/test.txt # edx-lint @@ -428,9 +424,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/test.txt types-python-dateutil==2.8.19.14 @@ -445,7 +438,7 @@ typing-extensions==4.8.0 # pydata-sphinx-theme # pylint # rich -urllib3==2.0.6 +urllib3==2.0.7 # via # -r requirements/test.txt # requests @@ -459,10 +452,6 @@ wheel==0.41.2 # via # -r requirements/pip-tools.txt # pip-tools -wrapt==1.15.0 - # via - # -r requirements/test.txt - # astroid zipp==3.17.0 # via # -r requirements/pip-tools.txt diff --git a/requirements/pip.txt b/requirements/pip.txt index 3e7d8f4a..0c788d61 100644 --- 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/test.txt b/requirements/test.txt index 8b78c306..1ce5b336 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -14,7 +14,7 @@ arrow==1.3.0 # cookiecutter asgiref==3.7.2 # via django -astroid==2.15.8 +astroid==3.0.1 # via # -r requirements/base.txt # pylint @@ -41,7 +41,7 @@ chardet==5.2.0 # via # -r requirements/base.txt # binaryornot -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/base.txt # requests @@ -134,10 +134,6 @@ jinja2==3.1.2 # sphinx keyring==24.2.0 # via twine -lazy-object-proxy==1.9.0 - # via - # -r requirements/base.txt - # astroid markdown-it-py==3.0.0 # via # -r requirements/base.txt @@ -177,7 +173,7 @@ platformdirs==3.11.0 # virtualenv pluggy==1.3.0 # via pytest -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via -r requirements/test.in pycparser==2.21 # via cffi @@ -194,7 +190,7 @@ pygments==2.16.1 # readme-renderer # rich # sphinx -pylint==2.17.7 +pylint==3.0.2 # via # -r requirements/base.txt # edx-lint @@ -205,7 +201,7 @@ pylint-celery==0.3 # via # -r requirements/base.txt # edx-lint -pylint-django==2.5.3 +pylint-django==2.5.5 # via # -r requirements/base.txt # edx-lint @@ -334,17 +330,13 @@ typing-extensions==4.8.0 # pydata-sphinx-theme # pylint # rich -urllib3==2.0.6 +urllib3==2.0.7 # via # -r requirements/base.txt # requests # twine virtualenv==20.24.5 # via -r requirements/test.in -wrapt==1.15.0 - # via - # -r requirements/base.txt - # astroid zipp==3.17.0 # via # importlib-metadata diff --git a/tox.ini b/tox.ini index d3bc996a..ad609a21 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ commands = pytest {posargs} [testenv:quality] -whitelist_externals = +allowlist_externals = make commands = make quality