From e7fa5c3c5006464b64188ac59267baeaa92c6168 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Wed, 15 Nov 2023 02:33:17 -0500 Subject: [PATCH 1/3] chore: Updating Python Requirements --- requirements/ci.txt | 35 ++++++++----- requirements/common_constraints.txt | 7 +-- requirements/dev.txt | 80 +++++++++++++++++------------ requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 +- requirements/quality.txt | 26 +++++----- requirements/test.txt | 16 +++--- 7 files changed, 96 insertions(+), 74 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index d9aa1cf..01ac7b0 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,41 +4,50 @@ # # make upgrade # +cachetools==5.3.2 + # via tox certifi==2023.7.22 # via requests -charset-normalizer==3.3.0 +chardet==5.2.0 + # via tox +charset-normalizer==3.3.2 # via requests codecov==2.1.13 # via -r requirements/ci.in +colorama==0.4.6 + # via tox coverage==7.3.2 # via codecov distlib==0.3.7 # via virtualenv -filelock==3.12.4 +filelock==3.13.1 # via # tox # virtualenv idna==3.4 # via requests packaging==23.2 - # via tox + # via + # pyproject-api + # tox platformdirs==3.11.0 - # via virtualenv + # via + # -c requirements/common_constraints.txt + # tox + # virtualenv pluggy==1.3.0 # via tox -py==1.11.0 +pyproject-api==1.6.1 # via tox requests==2.31.0 # via codecov -six==1.16.0 - # via tox tomli==2.0.1 - # via tox -tox==3.28.0 # via - # -c requirements/common_constraints.txt - # -r requirements/ci.in -urllib3==2.0.6 + # pyproject-api + # tox +tox==4.11.3 + # via -r requirements/ci.in +urllib3==2.1.0 # via requests -virtualenv==20.24.5 +virtualenv==20.24.6 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index afe6aa8..d6c9280 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -22,6 +22,7 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 -# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. -# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 -tox<4.0.0 +# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version +# This constraint can be removed once the issue +# https://github.com/pypa/virtualenv/issues/2666 gets resolved +platformdirs<4.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index 6c78ed2..07e1da0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,21 +6,27 @@ # asgiref==3.7.2 # via django -astroid==2.15.8 +astroid==3.0.1 # via # pylint # pylint-celery backports-functools-lru-cache==1.6.6 # via caniusepython3 +cachetools==5.3.2 + # via tox caniusepython3==7.3.0 # via -r requirements/quality.in certifi==2023.7.22 # via requests cffi==1.16.0 - # via pynacl + # via + # cryptography + # pynacl chardet==5.2.0 - # via diff-cover -charset-normalizer==3.3.0 + # via + # diff-cover + # tox +charset-normalizer==3.3.2 # via requests click==8.1.7 # via @@ -32,7 +38,11 @@ click-log==0.4.0 # via edx-lint code-annotations==1.5.0 # via edx-lint -diff-cover==7.7.0 +colorama==0.4.6 + # via tox +cryptography==41.0.5 + # via secretstorage +diff-cover==8.0.1 # via -r requirements/dev.in dill==0.3.7 # via pylint @@ -40,7 +50,7 @@ distlib==0.3.7 # via # caniusepython3 # virtualenv -django==3.2.22 +django==3.2.23 # via # -c requirements/common_constraints.txt # -r requirements/base.in @@ -60,15 +70,15 @@ djangorestframework==3.14.0 # via django-config-models docutils==0.20.1 # via readme-renderer -edx-django-utils==5.7.0 +edx-django-utils==5.8.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 @@ -78,7 +88,7 @@ importlib-metadata==6.8.0 # via # keyring # twine -importlib-resources==6.1.0 +importlib-resources==6.1.1 # via keyring isort==5.12.0 # via @@ -86,14 +96,16 @@ 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 +keyring==24.3.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 @@ -106,23 +118,26 @@ mdurl==0.1.2 # via markdown-it-py more-itertools==10.1.0 # via jaraco-classes -newrelic==9.1.0 +newrelic==9.1.2 # via edx-django-utils nh3==0.2.14 # via readme-renderer packaging==23.2 # via # caniusepython3 + # pyproject-api # tox path==16.7.1 # via edx-i18n-tools -pbr==5.11.1 +pbr==6.0.0 # via stevedore pkginfo==1.9.6 # via twine platformdirs==3.11.0 # via + # -c requirements/common_constraints.txt # pylint + # tox # virtualenv pluggy==1.3.0 # via @@ -130,11 +145,9 @@ 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 @@ -145,7 +158,7 @@ pygments==2.16.1 # diff-cover # readme-renderer # rich -pylint==2.17.7 +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -153,7 +166,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 @@ -161,6 +174,8 @@ pylint-plugin-utils==0.8.2 # pylint-django pynacl==1.5.0 # via edx-django-utils +pyproject-api==1.6.1 + # via tox python-slugify==8.0.1 # via code-annotations pytz==2023.3.post1 @@ -184,10 +199,10 @@ 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 - # tox + # via edx-lint snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.4.4 @@ -201,13 +216,12 @@ text-unidecode==1.3 tomli==2.0.1 # via # pylint + # pyproject-api # tox -tomlkit==0.12.1 +tomlkit==0.12.3 # via pylint -tox==3.28.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/dev.in +tox==4.11.3 + # via -r requirements/dev.in twine==4.0.2 # via -r requirements/dev.in typing-extensions==4.8.0 @@ -216,16 +230,14 @@ typing-extensions==4.8.0 # astroid # pylint # rich -urllib3==2.0.6 +urllib3==2.1.0 # 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..7db5707 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.2 # 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,23 +39,23 @@ 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 # via pylint packaging==23.2 # via caniusepython3 -pbr==5.11.1 +pbr==6.0.0 # via stevedore platformdirs==3.11.0 - # via pylint -pycodestyle==2.11.0 + # via + # -c requirements/common_constraints.txt + # pylint +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 +63,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 @@ -85,16 +85,14 @@ text-unidecode==1.3 # via python-slugify tomli==2.0.1 # via pylint -tomlkit==0.12.1 +tomlkit==0.12.3 # via pylint typing-extensions==4.8.0 # via # astroid # pylint -urllib3==2.0.6 +urllib3==2.1.0 # 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..105d9d4 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 @@ -28,33 +30,33 @@ django-waffle==4.0.0 # via edx-django-utils djangorestframework==3.14.0 # via django-config-models -edx-django-utils==5.7.0 +edx-django-utils==5.8.0 # via django-config-models exceptiongroup==1.1.3 # via pytest iniconfig==2.0.0 # via pytest -newrelic==9.1.0 +newrelic==9.1.2 # via edx-django-utils packaging==23.2 # via pytest -pbr==5.11.1 +pbr==6.0.0 # 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.7.0 # via -r requirements/test.in pytz==2023.3.post1 # via From 6c66789182291e8c301a140ba0363b284ec6bd5e Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Wed, 15 Nov 2023 12:44:28 +0500 Subject: [PATCH 2/3] fix: remove incompatible and unnecessary caniusepython3 plugin --- pylintrc | 6 +++--- pylintrc_tweaks | 2 +- requirements/dev.txt | 7 ------- requirements/quality.in | 1 - requirements/quality.txt | 10 ---------- 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pylintrc b/pylintrc index ee1d3b3..08d8415 100644 --- a/pylintrc +++ b/pylintrc @@ -64,12 +64,12 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.3.6 +# Generated by edx-lint version: 5.3.4 # ------------------------------ [MASTER] ignore = ,migrations persistent = yes -load-plugins = edx_lint.pylint,pylint_django,pylint_celery,caniusepython3.pylint_checker,edx_lint.pylint,pylint_django,pylint_celery +load-plugins = edx_lint.pylint,pylint_django,pylint_celery,edx_lint.pylint,pylint_django,pylint_celery [MESSAGES CONTROL] enable = @@ -384,4 +384,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = builtins.Exception -# 23c1c712481e8e036bee6d71fbec535bcd2c2cc1 +# 07fffdf493895bfaed1200d12fcd3e457730f89c diff --git a/pylintrc_tweaks b/pylintrc_tweaks index 9937669..9874351 100644 --- a/pylintrc_tweaks +++ b/pylintrc_tweaks @@ -1,7 +1,7 @@ # pylintrc tweaks for use with edx_lint. [MASTER] ignore+ = ,migrations -load-plugins+=,caniusepython3.pylint_checker,edx_lint.pylint,pylint_django,pylint_celery +load-plugins+=,edx_lint.pylint,pylint_django,pylint_celery [MESSAGES CONTROL] # Disable feature-toggle-needs-doc until we can agree to turn it on. diff --git a/requirements/dev.txt b/requirements/dev.txt index 07e1da0..98b9c38 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -10,12 +10,8 @@ astroid==3.0.1 # via # pylint # pylint-celery -backports-functools-lru-cache==1.6.6 - # via caniusepython3 cachetools==5.3.2 # via tox -caniusepython3==7.3.0 - # via -r requirements/quality.in certifi==2023.7.22 # via requests cffi==1.16.0 @@ -48,7 +44,6 @@ dill==0.3.7 # via pylint distlib==0.3.7 # via - # caniusepython3 # virtualenv django==3.2.23 # via @@ -124,7 +119,6 @@ nh3==0.2.14 # via readme-renderer packaging==23.2 # via - # caniusepython3 # pyproject-api # tox path==16.7.1 @@ -190,7 +184,6 @@ readme-renderer==42.0 # via twine requests==2.31.0 # via - # caniusepython3 # requests-toolbelt # twine requests-toolbelt==1.0.0 diff --git a/requirements/quality.in b/requirements/quality.in index 7e67ac8..b9b3e55 100644 --- a/requirements/quality.in +++ b/requirements/quality.in @@ -1,7 +1,6 @@ # Requirements for code quality checks -c constraints.txt -caniusepython3 # Additional Python 3 compatibility pylint checks edx-lint # edX pylint rules and plugins isort # to standardize order of imports pycodestyle # PEP 8 compliance validation diff --git a/requirements/quality.txt b/requirements/quality.txt index 7db5707..e095ddb 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,10 +8,6 @@ astroid==3.0.1 # via # pylint # pylint-celery -backports-functools-lru-cache==1.6.6 - # via caniusepython3 -caniusepython3==7.3.0 - # via -r requirements/quality.in certifi==2023.7.22 # via requests charset-normalizer==3.3.2 @@ -27,8 +23,6 @@ code-annotations==1.5.0 # via edx-lint dill==0.3.7 # via pylint -distlib==0.3.7 - # via caniusepython3 edx-lint==5.3.6 # via -r requirements/quality.in idna==3.4 @@ -43,8 +37,6 @@ markupsafe==2.1.3 # via jinja2 mccabe==0.7.0 # via pylint -packaging==23.2 - # via caniusepython3 pbr==6.0.0 # via stevedore platformdirs==3.11.0 @@ -73,8 +65,6 @@ python-slugify==8.0.1 # via code-annotations pyyaml==6.0.1 # via code-annotations -requests==2.31.0 - # via caniusepython3 six==1.16.0 # via edx-lint snowballstemmer==2.2.0 From cc63217ba7491679310d66d5dc2d2126a42f6250 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Wed, 15 Nov 2023 12:46:45 +0500 Subject: [PATCH 3/3] docs: add changelog entry --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e75544b..13af20b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,7 +14,7 @@ Change Log Unreleased ~~~~~~~~~~ -* +* Removed usage of deprecated and unnecessary pylint plugin 'caniusepython3' [1.3.0] - 2023-06-09 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~