Skip to content
This repository has been archived by the owner on Apr 19, 2024. It is now read-only.

Python Requirements Update #153

Merged
merged 3 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Change Log
Unreleased
~~~~~~~~~~

*
* Removed usage of deprecated and unnecessary pylint plugin 'caniusepython3'

[1.3.0] - 2023-06-09
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
6 changes: 3 additions & 3 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -384,4 +384,4 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = builtins.Exception

# 23c1c712481e8e036bee6d71fbec535bcd2c2cc1
# 07fffdf493895bfaed1200d12fcd3e457730f89c
2 changes: 1 addition & 1 deletion pylintrc_tweaks
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
35 changes: 22 additions & 13 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
87 changes: 46 additions & 41 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,23 @@
#
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
caniusepython3==7.3.0
# via -r requirements/quality.in
cachetools==5.3.2
# via tox
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
Expand All @@ -32,15 +34,18 @@ 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
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
Expand All @@ -60,15 +65,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
Expand All @@ -78,22 +83,24 @@ 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
# -r requirements/quality.in
# 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
Expand All @@ -106,35 +113,35 @@ 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
# diff-cover
# 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
Expand All @@ -145,22 +152,24 @@ pygments==2.16.1
# diff-cover
# readme-renderer
# rich
pylint==2.17.7
pylint==3.0.2
# via
# edx-lint
# pylint-celery
# pylint-django
# 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
# pylint-celery
# 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
Expand All @@ -175,7 +184,6 @@ readme-renderer==42.0
# via twine
requests==2.31.0
# via
# caniusepython3
# requests-toolbelt
# twine
requests-toolbelt==1.0.0
Expand All @@ -184,10 +192,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
Expand All @@ -201,13 +209,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
Expand All @@ -216,16 +223,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
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion requirements/quality.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading