From 5ef0db0531d34ab74a68fc3b54ab6f23a8a5223b Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 23 Oct 2023 08:41:10 -0400 Subject: [PATCH 1/2] fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery --- requirements/ci.in | 1 - requirements/ci.txt | 3 --- requirements/dev.in | 1 - requirements/dev.txt | 9 +++------ requirements/pip.txt | 2 +- requirements/quality.txt | 23 ++++++++++------------- requirements/test.txt | 14 ++++++++------ tox.ini | 2 +- 8 files changed, 23 insertions(+), 32 deletions(-) diff --git a/requirements/ci.in b/requirements/ci.in index 532ae97..afdeaa3 100644 --- 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 index e061da4..1324896 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -26,8 +26,5 @@ tox==3.28.0 # via # -c requirements/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.in b/requirements/dev.in index 045aa9c..c9981d8 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -4,4 +4,3 @@ pip-tools # Requirements file management tox # virtualenv management for tests -tox-battery # Makes tox aware of requirements file changes diff --git a/requirements/dev.txt b/requirements/dev.txt index b26eb08..fbf76e5 100644 --- a/requirements/dev.txt +++ b/requirements/dev.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 @@ -78,12 +78,9 @@ tox==3.28.0 # via # -c requirements/common_constraints.txt # -r requirements/dev.in - # tox-battery -tox-battery==0.6.2 - # via -r requirements/dev.in typing-extensions==4.8.0 # via asgiref -urllib3==1.26.17 +urllib3==1.26.18 # via botocore virtualenv==20.24.5 # via tox diff --git a/requirements/pip.txt b/requirements/pip.txt index b4e1ed8..6778a0a 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 f01f30a..567fa48 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -12,18 +12,18 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.8 +astroid==3.0.1 # via # pylint # pylint-celery backports-functools-lru-cache==1.6.6 # via caniusepython3 -boto3==1.28.62 +boto3==1.28.68 # via # -r requirements/test.txt # fs-s3fs # moto -botocore==1.31.62 +botocore==1.31.68 # via # -r requirements/test.txt # boto3 @@ -39,7 +39,7 @@ cffi==1.16.0 # via # -r requirements/test.txt # cryptography -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via # -r requirements/test.txt # requests @@ -55,6 +55,7 @@ code-annotations==1.5.0 coverage[toml]==7.3.2 # via # -r requirements/test.txt + # coverage # pytest-cov cryptography==41.0.4 # via @@ -119,8 +120,6 @@ jmespath==1.0.1 # botocore 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 @@ -136,7 +135,7 @@ mock==5.1.0 # via -r requirements/test.txt more-itertools==10.1.0 # via jaraco-classes -moto==4.2.5 +moto==4.2.6 # via -r requirements/test.txt nh3==0.2.14 # via readme-renderer @@ -155,7 +154,7 @@ pluggy==1.3.0 # via # -r requirements/test.txt # pytest -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via -r requirements/quality.in pycparser==2.21 # via @@ -167,7 +166,7 @@ pygments==2.16.1 # via # readme-renderer # rich -pylint==2.17.7 +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -175,7 +174,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 @@ -272,7 +271,7 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/test.txt # botocore @@ -283,8 +282,6 @@ werkzeug==3.0.0 # via # -r requirements/test.txt # moto -wrapt==1.15.0 - # via astroid xmltodict==0.13.0 # via # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index a7634ae..edaf085 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,11 +8,11 @@ appdirs==1.4.4 # via fs asgiref==3.7.2 # via django -boto3==1.28.62 +boto3==1.28.68 # via # fs-s3fs # moto -botocore==1.31.62 +botocore==1.31.68 # via # boto3 # moto @@ -21,10 +21,12 @@ certifi==2023.7.22 # via requests cffi==1.16.0 # via cryptography -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via requests coverage[toml]==7.3.2 - # via pytest-cov + # via + # coverage + # pytest-cov cryptography==41.0.4 # via moto # via @@ -54,7 +56,7 @@ markupsafe==2.1.3 # werkzeug mock==5.1.0 # via -r requirements/test.in -moto==4.2.5 +moto==4.2.6 # via -r requirements/test.in packaging==23.2 # via pytest @@ -104,7 +106,7 @@ types-pyyaml==6.0.12.12 # via responses typing-extensions==4.8.0 # via asgiref -urllib3==1.26.17 +urllib3==1.26.18 # via # botocore # requests diff --git a/tox.ini b/tox.ini index 7010831..82798db 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps = django42: Django>=4.2,<4.3 [testenv:quality] -whitelist_externals = +allowlist_externals = make rm touch From 1ec8883c91eed155457d274c8e5d7574692a519b Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 31 Oct 2023 18:19:05 +0500 Subject: [PATCH 2/2] fix: only tox-battery changes removed manually --- requirements/dev.txt | 6 +++--- requirements/pip.txt | 2 +- requirements/quality.txt | 23 +++++++++++++---------- requirements/test.txt | 14 ++++++-------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index fbf76e5..15294ac 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via fs asgiref==3.7.2 # via django -boto3==1.28.68 +boto3==1.28.62 # via fs-s3fs -botocore==1.31.68 +botocore==1.31.62 # via # boto3 # s3transfer @@ -80,7 +80,7 @@ tox==3.28.0 # -r requirements/dev.in typing-extensions==4.8.0 # via asgiref -urllib3==1.26.18 +urllib3==1.26.17 # via botocore virtualenv==20.24.5 # via tox diff --git a/requirements/pip.txt b/requirements/pip.txt index 6778a0a..b4e1ed8 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.3.1 +pip==23.2.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 567fa48..f01f30a 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -12,18 +12,18 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==3.0.1 +astroid==2.15.8 # via # pylint # pylint-celery backports-functools-lru-cache==1.6.6 # via caniusepython3 -boto3==1.28.68 +boto3==1.28.62 # via # -r requirements/test.txt # fs-s3fs # moto -botocore==1.31.68 +botocore==1.31.62 # via # -r requirements/test.txt # boto3 @@ -39,7 +39,7 @@ cffi==1.16.0 # via # -r requirements/test.txt # cryptography -charset-normalizer==3.3.1 +charset-normalizer==3.3.0 # via # -r requirements/test.txt # requests @@ -55,7 +55,6 @@ code-annotations==1.5.0 coverage[toml]==7.3.2 # via # -r requirements/test.txt - # coverage # pytest-cov cryptography==41.0.4 # via @@ -120,6 +119,8 @@ jmespath==1.0.1 # botocore 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 @@ -135,7 +136,7 @@ mock==5.1.0 # via -r requirements/test.txt more-itertools==10.1.0 # via jaraco-classes -moto==4.2.6 +moto==4.2.5 # via -r requirements/test.txt nh3==0.2.14 # via readme-renderer @@ -154,7 +155,7 @@ pluggy==1.3.0 # via # -r requirements/test.txt # pytest -pycodestyle==2.11.1 +pycodestyle==2.11.0 # via -r requirements/quality.in pycparser==2.21 # via @@ -166,7 +167,7 @@ pygments==2.16.1 # via # readme-renderer # rich -pylint==3.0.2 +pylint==2.17.7 # via # edx-lint # pylint-celery @@ -174,7 +175,7 @@ pylint==3.0.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.4 +pylint-django==2.5.3 # via edx-lint pylint-plugin-utils==0.8.2 # via @@ -271,7 +272,7 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==1.26.18 +urllib3==1.26.17 # via # -r requirements/test.txt # botocore @@ -282,6 +283,8 @@ werkzeug==3.0.0 # via # -r requirements/test.txt # moto +wrapt==1.15.0 + # via astroid xmltodict==0.13.0 # via # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index edaf085..a7634ae 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,11 +8,11 @@ appdirs==1.4.4 # via fs asgiref==3.7.2 # via django -boto3==1.28.68 +boto3==1.28.62 # via # fs-s3fs # moto -botocore==1.31.68 +botocore==1.31.62 # via # boto3 # moto @@ -21,12 +21,10 @@ certifi==2023.7.22 # via requests cffi==1.16.0 # via cryptography -charset-normalizer==3.3.1 +charset-normalizer==3.3.0 # via requests coverage[toml]==7.3.2 - # via - # coverage - # pytest-cov + # via pytest-cov cryptography==41.0.4 # via moto # via @@ -56,7 +54,7 @@ markupsafe==2.1.3 # werkzeug mock==5.1.0 # via -r requirements/test.in -moto==4.2.6 +moto==4.2.5 # via -r requirements/test.in packaging==23.2 # via pytest @@ -106,7 +104,7 @@ types-pyyaml==6.0.12.12 # via responses typing-extensions==4.8.0 # via asgiref -urllib3==1.26.18 +urllib3==1.26.17 # via # botocore # requests