From c3cc82cffdc17e20bea5c9a15fb2caf5c2ecfb2c Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Mon, 30 Oct 2023 09:44:31 -0400 Subject: [PATCH] fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery (#311) --- requirements/base.txt | 4 ++-- requirements/ci.in | 1 - requirements/ci.txt | 3 --- requirements/dev.txt | 24 +++++++----------------- requirements/doc.txt | 9 +++++---- requirements/pip.txt | 2 +- requirements/quality.txt | 17 +++++++---------- requirements/test.txt | 8 +++++--- tox.ini | 4 ++-- 9 files changed, 29 insertions(+), 43 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index b67c01c..63c3014 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -26,11 +26,11 @@ djangorestframework==3.14.0 # via -r requirements/base.in edx-django-utils==5.7.0 # via -r requirements/base.in -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 diff --git a/requirements/ci.in b/requirements/ci.in index 353de0e..573107a 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -2,5 +2,4 @@ -c constraints.txt tox # Virtualenv management for tests -tox-battery # Makes tox aware of requirements file changes tox-travis # Make tox understand travis environment vars. diff --git a/requirements/ci.txt b/requirements/ci.txt index cb6f4a6..46b078e 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -26,10 +26,7 @@ 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-travis -tox-battery==0.6.2 - # via -r requirements/ci.in tox-travis==0.13 # via -r requirements/ci.in virtualenv==20.24.5 diff --git a/requirements/dev.txt b/requirements/dev.txt index 2f072ce..60a7768 100644 --- 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 @@ -41,6 +41,7 @@ code-annotations==1.5.0 coverage[toml]==7.3.2 # via # -r requirements/quality.txt + # coverage # pytest-cov ddt==1.6.0 # via -r requirements/quality.txt @@ -104,10 +105,6 @@ jinja2==3.1.2 # via # -r requirements/quality.txt # code-annotations -lazy-object-proxy==1.9.0 - # via - # -r requirements/quality.txt - # astroid lxml==4.9.3 # via edx-i18n-tools markupsafe==2.1.3 @@ -118,7 +115,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 @@ -152,7 +149,7 @@ 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 @@ -160,7 +157,7 @@ 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 @@ -168,7 +165,7 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.txt -pylint==2.17.7 +pylint==3.0.2 # via # -r requirements/quality.txt # edx-lint @@ -179,7 +176,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 @@ -267,10 +264,7 @@ 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-travis -tox-battery==0.6.2 - # via -r requirements/ci.txt tox-travis==0.13 # via -r requirements/ci.txt typing-extensions==4.8.0 @@ -287,10 +281,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 index d34a4b6..11907c7 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -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 requests click==8.1.7 # via @@ -34,6 +34,7 @@ click==8.1.7 coverage[toml]==7.3.2 # via # -r requirements/test.txt + # coverage # pytest-cov cryptography==41.0.4 # via secretstorage @@ -103,7 +104,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 @@ -125,7 +126,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 @@ -230,7 +231,7 @@ typing-extensions==4.8.0 # asgiref # pydata-sphinx-theme # rich -urllib3==2.0.6 +urllib3==2.0.7 # via # requests # twine diff --git a/requirements/pip.txt b/requirements/pip.txt index 3e7d8f4..0c788d6 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/quality.txt b/requirements/quality.txt index cacf6d8..ff968d0 100644 --- 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 @@ -30,6 +30,7 @@ code-annotations==1.5.0 coverage[toml]==7.3.2 # via # -r requirements/test.txt + # coverage # pytest-cov ddt==1.6.0 # via -r requirements/test.txt @@ -71,13 +72,11 @@ 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 # via pylint -newrelic==9.1.0 +newrelic==9.1.1 # via # -r requirements/test.txt # edx-django-utils @@ -95,11 +94,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 @@ -107,7 +106,7 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.7 +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -115,7 +114,7 @@ pylint==2.17.7 # 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 @@ -179,5 +178,3 @@ typing-extensions==4.8.0 # asgiref # astroid # pylint -wrapt==1.15.0 - # via astroid diff --git a/requirements/test.txt b/requirements/test.txt index 11053f4..90edab4 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -17,7 +17,9 @@ click==8.1.7 # -r requirements/base.txt # edx-django-utils coverage[toml]==7.3.2 - # via pytest-cov + # via + # coverage + # pytest-cov ddt==1.6.0 # via -r requirements/test.in # via @@ -44,7 +46,7 @@ freezegun==1.2.2 # via -r requirements/test.in iniconfig==2.0.0 # via pytest -newrelic==9.1.0 +newrelic==9.1.1 # via # -r requirements/base.txt # edx-django-utils @@ -56,7 +58,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 diff --git a/tox.ini b/tox.ini index 7f9c78c..0408c6f 100644 --- a/tox.ini +++ b/tox.ini @@ -30,7 +30,7 @@ commands = setenv = DJANGO_SETTINGS_MODULE = test_settings PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps -whitelist_externals = +allowlist_externals = make rm deps = @@ -47,7 +47,7 @@ commands = [testenv:quality] setenv = PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps -whitelist_externals = +allowlist_externals = make rm touch