From dfb20a3df6362972fb53ba06a414410b83608d51 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 31 Oct 2023 15:08:06 +0500 Subject: [PATCH 1/3] fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery --- pylintrc | 7 ++++--- requirements/ci.in | 1 - requirements/ci.txt | 11 ++++------- requirements/dev.txt | 40 +++++++++++++------------------------- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 ++-- requirements/quality.txt | 18 +++++++---------- requirements/test.txt | 12 +++++++----- tox.ini | 2 +- 9 files changed, 39 insertions(+), 58 deletions(-) diff --git a/pylintrc b/pylintrc index 3364247..ee1d3b3 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.5 +# Generated by edx-lint version: 5.3.6 # ------------------------------ [MASTER] ignore = ,migrations @@ -259,6 +259,7 @@ enable = useless-suppression, disable = bad-indentation, + broad-exception-raised, consider-using-f-string, duplicate-code, file-ignored, @@ -381,6 +382,6 @@ ext-import-graph = int-import-graph = [EXCEPTIONS] -overgeneral-exceptions = Exception +overgeneral-exceptions = builtins.Exception -# 277587d1653a70fa8c900f74c6cd5892538385f1 +# 23c1c712481e8e036bee6d71fbec535bcd2c2cc1 diff --git a/requirements/ci.in b/requirements/ci.in index b11afcc..de1f974 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -4,4 +4,3 @@ codecov # Code coverage reporting 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 6b11777..7148575 100644 --- 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 codecov==2.1.13 # via -r requirements/ci.in @@ -14,7 +14,7 @@ coverage==7.3.2 # via codecov distlib==0.3.7 # via virtualenv -filelock==3.12.4 +filelock==3.13.1 # via # tox # virtualenv @@ -38,10 +38,7 @@ 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 -urllib3==2.0.6 +urllib3==2.0.7 # via requests -virtualenv==20.24.5 +virtualenv==20.24.6 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index a97d966..155f61a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,7 +6,7 @@ # asgiref==3.7.2 # via django -astroid==2.15.8 +astroid==3.0.1 # via # pylint # pylint-celery @@ -17,12 +17,10 @@ caniusepython3==7.3.0 certifi==2023.7.22 # via requests cffi==1.16.0 - # via - # cryptography - # pynacl + # via pynacl chardet==5.2.0 # via diff-cover -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via requests click==8.1.7 # via @@ -34,8 +32,6 @@ click-log==0.4.0 # via edx-lint code-annotations==1.5.0 # via edx-lint -cryptography==41.0.4 - # via secretstorage diff-cover==7.7.0 # via -r requirements/dev.in dill==0.3.7 @@ -68,11 +64,11 @@ edx-django-utils==5.7.0 # via django-config-models edx-i18n-tools==1.3.0 # via -r requirements/dev.in -edx-lint==5.3.4 +edx-lint==5.3.6 # via # -r requirements/dev.in # -r requirements/quality.in -filelock==3.12.4 +filelock==3.13.1 # via # tox # virtualenv @@ -90,18 +86,12 @@ isort==5.12.0 # pylint jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.2 # via # code-annotations # diff-cover keyring==24.2.0 # via twine -lazy-object-proxy==1.9.0 - # via astroid lxml==4.9.3 # via edx-i18n-tools markdown-it-py==3.0.0 @@ -114,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 edx-django-utils nh3==0.2.14 # via readme-renderer @@ -138,11 +128,11 @@ pluggy==1.3.0 # tox polib==1.2.0 # via edx-i18n-tools -psutil==5.9.5 +psutil==5.9.6 # via edx-django-utils py==1.11.0 # via tox -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via -r requirements/quality.in pycparser==2.21 # via cffi @@ -153,7 +143,7 @@ pygments==2.16.1 # diff-cover # readme-renderer # rich -pylint==2.17.7 +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -161,7 +151,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 @@ -192,8 +182,6 @@ rfc3986==2.0.0 # via twine rich==13.6.0 # via twine -secretstorage==3.3.3 - # via keyring six==1.16.0 # via # edx-lint @@ -229,16 +217,14 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==2.0.6 +urllib3==2.0.7 # via # requests # twine -virtualenv==20.24.5 +virtualenv==20.24.6 # via tox -wheel==0.41.2 +wheel==0.41.3 # via -r requirements/dev.in -wrapt==1.15.0 - # via astroid zipp==3.17.0 # via # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 50d35f2..ea34731 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -21,7 +21,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.41.2 +wheel==0.41.3 # via pip-tools zipp==3.17.0 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 3e7d8f4..9014f2c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.2 +wheel==0.41.3 # 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 656839f..c9421d3 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==2.15.8 +astroid==3.0.1 # via # pylint # pylint-celery @@ -14,7 +14,7 @@ caniusepython3==7.3.0 # via -r requirements/quality.in certifi==2023.7.22 # via requests -charset-normalizer==3.3.0 +charset-normalizer==3.3.1 # via requests click==8.1.7 # via @@ -29,7 +29,7 @@ dill==0.3.7 # via pylint distlib==0.3.7 # via caniusepython3 -edx-lint==5.3.4 +edx-lint==5.3.6 # via -r requirements/quality.in idna==3.4 # via requests @@ -39,8 +39,6 @@ isort==5.12.0 # 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 @@ -51,11 +49,11 @@ pbr==5.11.1 # via stevedore platformdirs==3.11.0 # via pylint -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.7 +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -63,7 +61,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 @@ -91,10 +89,8 @@ typing-extensions==4.8.0 # via # astroid # pylint -urllib3==2.0.6 +urllib3==2.0.7 # via requests -wrapt==1.15.0 - # via astroid # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test.txt b/requirements/test.txt index 1a55a04..341ebc9 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -11,7 +11,9 @@ cffi==1.16.0 click==8.1.7 # via edx-django-utils coverage[toml]==7.3.2 - # via pytest-cov + # via + # coverage + # pytest-cov # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -34,7 +36,7 @@ exceptiongroup==1.1.3 # via pytest iniconfig==2.0.0 # via pytest -newrelic==9.1.0 +newrelic==9.1.1 # via edx-django-utils packaging==23.2 # via pytest @@ -42,19 +44,19 @@ pbr==5.11.1 # via stevedore pluggy==1.3.0 # via pytest -psutil==5.9.5 +psutil==5.9.6 # via edx-django-utils pycparser==2.21 # via cffi pynacl==1.5.0 # via edx-django-utils -pytest==7.4.2 +pytest==7.4.3 # via # pytest-cov # pytest-django pytest-cov==4.1.0 # via -r requirements/test.in -pytest-django==4.5.2 +pytest-django==4.6.0 # via -r requirements/test.in pytz==2023.3.post1 # via diff --git a/tox.ini b/tox.ini index 70b9449..f22bc5d 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ commands = setenv = DJANGO_SETTINGS_MODULE=test_settings PYTHONPATH = . -whitelist_externals = +allowlist_externals = make rm touch From 248ecccedf40cf589027c6b40eeb1dc0d468914b Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 31 Oct 2023 16:02:29 +0500 Subject: [PATCH 2/3] fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery --- Makefile | 12 ++++++------ requirements/ci.txt | 8 ++++---- requirements/dev.in | 1 - requirements/dev.txt | 31 ++++++++++++++++--------------- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 ++-- requirements/quality.txt | 18 +++++++++++------- requirements/test.txt | 12 +++++------- 8 files changed, 45 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index e6e2608..383ff47 100644 --- a/Makefile +++ b/Makefile @@ -43,14 +43,14 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -qr requirements/pip-tools.txt - pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in - pip-compile --upgrade --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in + pip-compile --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in + pip-compile --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt - pip-compile --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in - pip-compile --upgrade -o requirements/quality.txt requirements/quality.in - pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in - pip-compile --upgrade -o requirements/ci.txt requirements/ci.in + pip-compile -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in + pip-compile -o requirements/quality.txt requirements/quality.in + pip-compile -o requirements/test.txt requirements/base.in requirements/test.in + pip-compile -o requirements/ci.txt requirements/ci.in # Let tox control the Django version for tests sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp mv requirements/test.tmp requirements/test.txt diff --git a/requirements/ci.txt b/requirements/ci.txt index 7148575..d9aa1cf 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,7 +6,7 @@ # certifi==2023.7.22 # via requests -charset-normalizer==3.3.1 +charset-normalizer==3.3.0 # via requests codecov==2.1.13 # via -r requirements/ci.in @@ -14,7 +14,7 @@ coverage==7.3.2 # via codecov distlib==0.3.7 # via virtualenv -filelock==3.13.1 +filelock==3.12.4 # via # tox # virtualenv @@ -38,7 +38,7 @@ tox==3.28.0 # via # -c requirements/common_constraints.txt # -r requirements/ci.in -urllib3==2.0.7 +urllib3==2.0.6 # via requests -virtualenv==20.24.6 +virtualenv==20.24.5 # via tox diff --git a/requirements/dev.in b/requirements/dev.in index 2089da9..376a240 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -5,6 +5,5 @@ diff-cover # Changeset diff test coverage edx-lint # For updating pylintrc edx-i18n-tools # For i18n_tool dummy tox # virtualenv management for tests -tox-battery # Makes tox aware of requirements file changes twine # Utility for PyPI package uploads wheel # For generation of wheels for PyPI diff --git a/requirements/dev.txt b/requirements/dev.txt index 155f61a..6c78ed2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,7 +6,7 @@ # asgiref==3.7.2 # via django -astroid==3.0.1 +astroid==2.15.8 # via # pylint # pylint-celery @@ -20,7 +20,7 @@ cffi==1.16.0 # via pynacl chardet==5.2.0 # via diff-cover -charset-normalizer==3.3.1 +charset-normalizer==3.3.0 # via requests click==8.1.7 # via @@ -64,11 +64,11 @@ edx-django-utils==5.7.0 # via django-config-models edx-i18n-tools==1.3.0 # via -r requirements/dev.in -edx-lint==5.3.6 +edx-lint==5.3.4 # via # -r requirements/dev.in # -r requirements/quality.in -filelock==3.13.1 +filelock==3.12.4 # via # tox # virtualenv @@ -92,6 +92,8 @@ jinja2==3.1.2 # diff-cover keyring==24.2.0 # via twine +lazy-object-proxy==1.9.0 + # via astroid lxml==4.9.3 # via edx-i18n-tools markdown-it-py==3.0.0 @@ -104,7 +106,7 @@ mdurl==0.1.2 # via markdown-it-py more-itertools==10.1.0 # via jaraco-classes -newrelic==9.1.1 +newrelic==9.1.0 # via edx-django-utils nh3==0.2.14 # via readme-renderer @@ -128,11 +130,11 @@ pluggy==1.3.0 # tox polib==1.2.0 # via edx-i18n-tools -psutil==5.9.6 +psutil==5.9.5 # via edx-django-utils py==1.11.0 # via tox -pycodestyle==2.11.1 +pycodestyle==2.11.0 # via -r requirements/quality.in pycparser==2.21 # via cffi @@ -143,7 +145,7 @@ pygments==2.16.1 # diff-cover # readme-renderer # rich -pylint==3.0.2 +pylint==2.17.7 # via # edx-lint # pylint-celery @@ -151,7 +153,7 @@ pylint==3.0.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.5 +pylint-django==2.5.3 # via edx-lint pylint-plugin-utils==0.8.2 # via @@ -206,9 +208,6 @@ 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 twine==4.0.2 # via -r requirements/dev.in typing-extensions==4.8.0 @@ -217,14 +216,16 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==2.0.7 +urllib3==2.0.6 # via # requests # twine -virtualenv==20.24.6 +virtualenv==20.24.5 # via tox -wheel==0.41.3 +wheel==0.41.2 # via -r requirements/dev.in +wrapt==1.15.0 + # via astroid zipp==3.17.0 # via # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index ea34731..50d35f2 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -21,7 +21,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.41.3 +wheel==0.41.2 # via pip-tools zipp==3.17.0 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 9014f2c..3e7d8f4 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.3 +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 c9421d3..656839f 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==3.0.1 +astroid==2.15.8 # via # pylint # pylint-celery @@ -14,7 +14,7 @@ caniusepython3==7.3.0 # via -r requirements/quality.in certifi==2023.7.22 # via requests -charset-normalizer==3.3.1 +charset-normalizer==3.3.0 # via requests click==8.1.7 # via @@ -29,7 +29,7 @@ dill==0.3.7 # via pylint distlib==0.3.7 # via caniusepython3 -edx-lint==5.3.6 +edx-lint==5.3.4 # via -r requirements/quality.in idna==3.4 # via requests @@ -39,6 +39,8 @@ isort==5.12.0 # 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 @@ -49,11 +51,11 @@ pbr==5.11.1 # via stevedore platformdirs==3.11.0 # via pylint -pycodestyle==2.11.1 +pycodestyle==2.11.0 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==3.0.2 +pylint==2.17.7 # via # edx-lint # pylint-celery @@ -61,7 +63,7 @@ pylint==3.0.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.5 +pylint-django==2.5.3 # via edx-lint pylint-plugin-utils==0.8.2 # via @@ -89,8 +91,10 @@ typing-extensions==4.8.0 # via # astroid # pylint -urllib3==2.0.7 +urllib3==2.0.6 # via requests +wrapt==1.15.0 + # via astroid # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test.txt b/requirements/test.txt index 341ebc9..1a55a04 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -11,9 +11,7 @@ cffi==1.16.0 click==8.1.7 # via edx-django-utils coverage[toml]==7.3.2 - # via - # coverage - # pytest-cov + # via pytest-cov # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -36,7 +34,7 @@ exceptiongroup==1.1.3 # via pytest iniconfig==2.0.0 # via pytest -newrelic==9.1.1 +newrelic==9.1.0 # via edx-django-utils packaging==23.2 # via pytest @@ -44,19 +42,19 @@ pbr==5.11.1 # via stevedore pluggy==1.3.0 # via pytest -psutil==5.9.6 +psutil==5.9.5 # via edx-django-utils pycparser==2.21 # via cffi pynacl==1.5.0 # via edx-django-utils -pytest==7.4.3 +pytest==7.4.2 # via # pytest-cov # pytest-django pytest-cov==4.1.0 # via -r requirements/test.in -pytest-django==4.6.0 +pytest-django==4.5.2 # via -r requirements/test.in pytz==2023.3.post1 # via From 2466898e27bc2bf68b87e4efbe2033534cd82689 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 31 Oct 2023 16:03:46 +0500 Subject: [PATCH 3/3] fix: Makefile changes reverted --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 383ff47..e6e2608 100644 --- a/Makefile +++ b/Makefile @@ -43,14 +43,14 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -qr requirements/pip-tools.txt - pip-compile --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in - pip-compile --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in + pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in + pip-compile --upgrade --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt - pip-compile -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in - pip-compile -o requirements/quality.txt requirements/quality.in - pip-compile -o requirements/test.txt requirements/base.in requirements/test.in - pip-compile -o requirements/ci.txt requirements/ci.in + pip-compile --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in + pip-compile --upgrade -o requirements/quality.txt requirements/quality.in + pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in + pip-compile --upgrade -o requirements/ci.txt requirements/ci.in # Let tox control the Django version for tests sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp mv requirements/test.tmp requirements/test.txt