From cb23c687d2aa385c00c1ab08b47917c470a7936b Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Tue, 25 Oct 2022 12:11:25 +0500 Subject: [PATCH 1/2] fix: fix make upgrade --- Makefile | 15 +- pylintrc | 385 ++++++++++++++++++++++++++++ requirements/ci.txt | 35 ++- requirements/common_constraints.txt | 25 ++ requirements/constraints.txt | 2 + requirements/dev.txt | 169 +++++++----- requirements/django.txt | 2 +- requirements/pip-tools.in | 3 + requirements/pip-tools.txt | 20 ++ requirements/pip.in | 6 + requirements/pip.txt | 16 ++ requirements/quality.txt | 156 ++++++----- requirements/test.txt | 134 ++++++---- requirements/travis.txt | 35 ++- 14 files changed, 788 insertions(+), 215 deletions(-) create mode 100644 pylintrc create mode 100644 requirements/common_constraints.txt create mode 100644 requirements/pip-tools.in create mode 100644 requirements/pip-tools.txt create mode 100644 requirements/pip.in create mode 100644 requirements/pip.txt diff --git a/Makefile b/Makefile index 6322b56..5e3afc4 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,19 @@ coverage: clean ## generate and view HTML coverage report pytest --cov-report html $(BROWSER) htmlcov/index.html -upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in - pip install -q pip-tools +COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt +.PHONY: $(COMMON_CONSTRAINTS_TXT) +$(COMMON_CONSTRAINTS_TXT): + wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)" + +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 --rebuild --allow-unsafe -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 --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in requirements/test.in requirements/travis.in pip-compile --upgrade -o requirements/quality.txt requirements/base.in requirements/quality.in requirements/test.in pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in diff --git a/pylintrc b/pylintrc new file mode 100644 index 0000000..e2e1a3a --- /dev/null +++ b/pylintrc @@ -0,0 +1,385 @@ +# *************************** +# ** DO NOT EDIT THIS FILE ** +# *************************** +# +# This file was generated by edx-lint: https://github.com/edx/edx-lint +# +# If you want to change this file, you have two choices, depending on whether +# you want to make a local change that applies only to this repo, or whether +# you want to make a central change that applies to all repos using edx-lint. +# +# Note: If your pylintrc file is simply out-of-date relative to the latest +# pylintrc in edx-lint, ensure you have the latest edx-lint installed +# and then follow the steps for a "LOCAL CHANGE". +# +# LOCAL CHANGE: +# +# 1. Edit the local pylintrc_tweaks file to add changes just to this +# repo's file. +# +# 2. Run: +# +# $ edx_lint write pylintrc +# +# 3. This will modify the local file. Submit a pull request to get it +# checked in so that others will benefit. +# +# +# CENTRAL CHANGE: +# +# 1. Edit the pylintrc file in the edx-lint repo at +# https://github.com/edx/edx-lint/blob/master/edx_lint/files/pylintrc +# +# 2. install the updated version of edx-lint (in edx-lint): +# +# $ pip install . +# +# 3. Run (in edx-lint): +# +# $ edx_lint write pylintrc +# +# 4. Make a new version of edx_lint, submit and review a pull request with the +# pylintrc update, and after merging, update the edx-lint version and +# publish the new version. +# +# 5. In your local repo, install the newer version of edx-lint. +# +# 6. Run: +# +# $ edx_lint write pylintrc +# +# 7. This will modify the local file. Submit a pull request to get it +# checked in so that others will benefit. +# +# +# +# +# +# STAY AWAY FROM THIS FILE! +# +# +# +# +# +# SERIOUSLY. +# +# ------------------------------ +# Generated by edx-lint version: 5.2.4 +# ------------------------------ +[MASTER] +ignore = +persistent = yes +load-plugins = edx_lint.pylint,pylint_django,pylint_celery + +[MESSAGES CONTROL] +enable = + blacklisted-name, + line-too-long, + + abstract-class-instantiated, + abstract-method, + access-member-before-definition, + anomalous-backslash-in-string, + anomalous-unicode-escape-in-string, + arguments-differ, + assert-on-tuple, + assigning-non-slot, + assignment-from-no-return, + assignment-from-none, + attribute-defined-outside-init, + bad-except-order, + bad-format-character, + bad-format-string-key, + bad-format-string, + bad-open-mode, + bad-reversed-sequence, + bad-staticmethod-argument, + bad-str-strip-call, + bad-super-call, + binary-op-exception, + boolean-datetime, + catching-non-exception, + cell-var-from-loop, + confusing-with-statement, + continue-in-finally, + dangerous-default-value, + duplicate-argument-name, + duplicate-bases, + duplicate-except, + duplicate-key, + expression-not-assigned, + format-combined-specification, + format-needs-mapping, + function-redefined, + global-variable-undefined, + import-error, + import-self, + inconsistent-mro, + inherit-non-class, + init-is-generator, + invalid-all-object, + invalid-format-index, + invalid-length-returned, + invalid-sequence-index, + invalid-slice-index, + invalid-slots-object, + invalid-slots, + invalid-unary-operand-type, + logging-too-few-args, + logging-too-many-args, + logging-unsupported-format, + lost-exception, + method-hidden, + misplaced-bare-raise, + misplaced-future, + missing-format-argument-key, + missing-format-attribute, + missing-format-string-key, + no-member, + no-method-argument, + no-name-in-module, + no-self-argument, + no-value-for-parameter, + non-iterator-returned, + non-parent-method-called, + nonexistent-operator, + not-a-mapping, + not-an-iterable, + not-callable, + not-context-manager, + not-in-loop, + pointless-statement, + pointless-string-statement, + raising-bad-type, + raising-non-exception, + redefined-builtin, + redefined-outer-name, + redundant-keyword-arg, + repeated-keyword, + return-arg-in-generator, + return-in-init, + return-outside-function, + signature-differs, + super-init-not-called, + super-method-not-called, + syntax-error, + test-inherits-tests, + too-few-format-args, + too-many-format-args, + too-many-function-args, + translation-of-non-string, + truncated-format-string, + undefined-all-variable, + undefined-loop-variable, + undefined-variable, + unexpected-keyword-arg, + unexpected-special-method-signature, + unpacking-non-sequence, + unreachable, + unsubscriptable-object, + unsupported-binary-operation, + unsupported-membership-test, + unused-format-string-argument, + unused-format-string-key, + used-before-assignment, + using-constant-test, + yield-outside-function, + + astroid-error, + fatal, + method-check-failed, + parse-error, + raw-checker-failed, + + empty-docstring, + invalid-characters-in-docstring, + missing-docstring, + wrong-spelling-in-comment, + wrong-spelling-in-docstring, + + unused-argument, + unused-import, + unused-variable, + + eval-used, + exec-used, + + bad-classmethod-argument, + bad-mcs-classmethod-argument, + bad-mcs-method-argument, + bare-except, + broad-except, + consider-iterating-dictionary, + consider-using-enumerate, + global-at-module-level, + global-variable-not-assigned, + literal-used-as-attribute, + logging-format-interpolation, + logging-not-lazy, + multiple-imports, + multiple-statements, + no-classmethod-decorator, + no-staticmethod-decorator, + protected-access, + redundant-unittest-assert, + reimported, + simplifiable-if-statement, + simplifiable-range, + singleton-comparison, + superfluous-parens, + unidiomatic-typecheck, + unnecessary-lambda, + unnecessary-pass, + unnecessary-semicolon, + unneeded-not, + useless-else-on-loop, + wrong-assert-type, + + deprecated-method, + deprecated-module, + + too-many-boolean-expressions, + too-many-nested-blocks, + too-many-statements, + + wildcard-import, + wrong-import-order, + wrong-import-position, + + missing-final-newline, + mixed-line-endings, + trailing-newlines, + trailing-whitespace, + unexpected-line-ending-format, + + bad-inline-option, + bad-option-value, + deprecated-pragma, + unrecognized-inline-option, + useless-suppression, +disable = + bad-indentation, + consider-using-f-string, + duplicate-code, + file-ignored, + fixme, + global-statement, + invalid-name, + locally-disabled, + no-else-return, + suppressed-message, + too-few-public-methods, + too-many-ancestors, + too-many-arguments, + too-many-branches, + too-many-instance-attributes, + too-many-lines, + too-many-locals, + too-many-public-methods, + too-many-return-statements, + ungrouped-imports, + unspecified-encoding, + unused-wildcard-import, + use-maxsplit-arg, + + feature-toggle-needs-doc, + illegal-waffle-usage, + + logging-fstring-interpolation, + +[REPORTS] +output-format = text +reports = no +score = no + +[BASIC] +module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ +const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$ +class-rgx = [A-Z_][a-zA-Z0-9]+$ +function-rgx = ([a-z_][a-z0-9_]{2,40}|test_[a-z0-9_]+)$ +method-rgx = ([a-z_][a-z0-9_]{2,40}|setUp|set[Uu]pClass|tearDown|tear[Dd]ownClass|assert[A-Z]\w*|maxDiff|test_[a-z0-9_]+)$ +attr-rgx = [a-z_][a-z0-9_]{2,30}$ +argument-rgx = [a-z_][a-z0-9_]{2,30}$ +variable-rgx = [a-z_][a-z0-9_]{2,30}$ +class-attribute-rgx = ([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ +inlinevar-rgx = [A-Za-z_][A-Za-z0-9_]*$ +good-names = f,i,j,k,db,ex,Run,_,__ +bad-names = foo,bar,baz,toto,tutu,tata +no-docstring-rgx = __.*__$|test_.+|setUp$|setUpClass$|tearDown$|tearDownClass$|Meta$ +docstring-min-length = 5 + +[FORMAT] +max-line-length = 120 +ignore-long-lines = ^\s*(# )?((?)|(\.\. \w+: .*))$ +single-line-if-stmt = no +max-module-lines = 1000 +indent-string = ' ' + +[MISCELLANEOUS] +notes = FIXME,XXX,TODO + +[SIMILARITIES] +min-similarity-lines = 4 +ignore-comments = yes +ignore-docstrings = yes +ignore-imports = no + +[TYPECHECK] +ignore-mixin-members = yes +ignored-classes = SQLObject +unsafe-load-any-extension = yes +generated-members = + REQUEST, + acl_users, + aq_parent, + objects, + DoesNotExist, + can_read, + can_write, + get_url, + size, + content, + status_code, + create, + build, + fields, + tag, + org, + course, + category, + name, + revision, + _meta, + +[VARIABLES] +init-import = no +dummy-variables-rgx = _|dummy|unused|.*_unused +additional-builtins = + +[CLASSES] +defining-attr-methods = __init__,__new__,setUp +valid-classmethod-first-arg = cls +valid-metaclass-classmethod-first-arg = mcs + +[DESIGN] +max-args = 5 +ignored-argument-names = _.* +max-locals = 15 +max-returns = 6 +max-branches = 12 +max-statements = 50 +max-parents = 7 +max-attributes = 7 +min-public-methods = 2 +max-public-methods = 20 + +[IMPORTS] +deprecated-modules = regsub,TERMIOS,Bastion,rexec +import-graph = +ext-import-graph = +int-import-graph = + +[EXCEPTIONS] +overgeneral-exceptions = Exception + +# fad4071fe38e655a180214bd3f6bce3ffa41b2ed diff --git a/requirements/ci.txt b/requirements/ci.txt index 0a5f88c..f16bbcb 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -2,31 +2,30 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile --output-file=requirements/ci.txt requirements/ci.in +# make upgrade # -asgiref==3.4.1 +asgiref==3.5.2 # via django -backports.entry-points-selectable==1.1.1 - # via virtualenv -certifi==2021.10.8 +certifi==2022.6.15 # via requests -charset-normalizer==2.0.9 +charset-normalizer==2.0.12 # via requests -coverage==6.2 +coverage==6.4.1 # via coveralls coveralls==3.3.1 # via -r requirements/ci.in distlib==0.3.4 # via virtualenv -django==3.2.10 +django==3.2.13 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # edx-i18n-tools docopt==0.6.2 # via coveralls -edx-i18n-tools==0.8.1 +edx-i18n-tools==0.9.1 # via -r requirements/ci.in -filelock==3.4.0 +filelock==3.7.1 # via # tox # virtualenv @@ -34,9 +33,9 @@ idna==3.3 # via requests packaging==21.3 # via tox -path==16.2.0 +path==16.4.0 # via edx-i18n-tools -platformdirs==2.4.0 +platformdirs==2.5.2 # via virtualenv pluggy==1.0.0 # via tox @@ -44,13 +43,13 @@ polib==1.1.1 # via edx-i18n-tools py==1.11.0 # via tox -pyparsing==3.0.6 +pyparsing==3.0.9 # via packaging -pytz==2021.3 +pytz==2022.1 # via django pyyaml==6.0 # via edx-i18n-tools -requests==2.26.0 +requests==2.28.0 # via coveralls six==1.16.0 # via @@ -60,13 +59,13 @@ sqlparse==0.4.2 # via django toml==0.10.2 # via tox -tox==3.24.4 +tox==3.25.0 # via # -r requirements/ci.in # tox-battery tox-battery==0.6.1 # via -r requirements/ci.in -urllib3==1.26.7 +urllib3==1.26.9 # via requests -virtualenv==20.10.0 +virtualenv==20.14.1 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt new file mode 100644 index 0000000..cca3ccd --- /dev/null +++ b/requirements/common_constraints.txt @@ -0,0 +1,25 @@ +# A central location for most common version constraints +# (across edx repos) for pip-installation. +# +# Similar to other constraint files this file doesn't install any packages. +# It specifies version constraints that will be applied if a package is needed. +# When pinning something here, please provide an explanation of why it is a good +# idea to pin this package across all edx repos, Ideally, link to other information +# that will help people in the future to remove the pin when possible. +# Writing an issue against the offending project and linking to it here is good. +# +# Note: Changes to this file will automatically be used by other repos, referencing +# this file from Github directly. It does not require packaging in edx-lint. + + +# using LTS django version +Django<4.0 + +# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. +# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html +elasticsearch<7.14.0 + +setuptools<60 + +# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected +django-simple-history==3.0.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 87efa98..fa9c13f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -8,6 +8,8 @@ # pin when possible. Writing an issue against the offending project and # linking to it here is good. +-c common_constraints.txt + # TODO: Many pinned dependencies should be unpinned and/or moved to this constraints file. # Use latest Django LTS version diff --git a/requirements/dev.txt b/requirements/dev.txt index 7cdb758..0fd5de5 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -2,91 +2,107 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile --output-file=requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in requirements/test.in requirements/travis.in +# make upgrade # appdirs==1.4.4 # via fs -asgiref==3.4.1 +arrow==1.2.2 + # via jinja2-time +asgiref==3.5.2 # via django -astroid==2.9.0 +astroid==2.11.6 # via # pylint # pylint-celery -attrs==21.2.0 +attrs==21.4.0 # via pytest -backports.entry-points-selectable==1.1.1 - # via virtualenv -backports.functools-lru-cache==1.6.4 +backports-functools-lru-cache==1.6.4 # via caniusepython3 +binaryornot==0.4.4 + # via cookiecutter bok-choy==1.1.1 # via -r requirements/test.in -boto3==1.20.25 +boto==2.49.0 + # via xblock-sdk +boto3==1.24.15 # via fs-s3fs -botocore==1.23.25 +botocore==1.27.15 # via # boto3 # s3transfer caniusepython3==7.3.0 # via -r requirements/quality.in -certifi==2021.10.8 +certifi==2022.6.15 # via requests chardet==4.0.0 - # via diff-cover -charset-normalizer==2.0.9 + # via + # binaryornot + # diff-cover +charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==8.1.3 # via # click-log # code-annotations + # cookiecutter # edx-lint # pip-tools -click-log==0.3.2 +click-log==0.4.0 # via edx-lint -code-annotations==1.2.0 +code-annotations==1.3.0 # via edx-lint -coverage[toml]==6.2 +cookiecutter==2.1.1 + # via xblock-sdk +coverage[toml]==6.4.1 # via # coveralls # pytest-cov coveralls==3.3.1 # via -r requirements/travis.in -ddt==1.4.4 +ddt==1.5.0 # via -r requirements/test.in -diff-cover==6.4.4 +diff-cover==6.5.1 # via -r requirements/dev.in +dill==0.3.5.1 + # via pylint distlib==0.3.4 # via # caniusepython3 # virtualenv -django==3.2.10 +django==3.2.13 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in # django-pyfs # edx-i18n-tools # xblock-sdk -django-pyfs==3.1.0 - # via xblock +django-pyfs==3.2.0 + # via + # xblock + # xblock-sdk docopt==0.6.2 # via coveralls -edx-i18n-tools==0.8.1 +edx-i18n-tools==0.9.1 # via -r requirements/travis.in -edx-lint==5.2.1 +edx-lint==5.2.4 # via -r requirements/quality.in -filelock==3.4.0 +filelock==3.7.1 # via # tox # virtualenv -fs==2.4.14 +fs==2.4.16 # via # django-pyfs # fs-s3fs # xblock fs-s3fs==1.1.1 - # via django-pyfs + # via + # django-pyfs + # xblock-sdk gitdb==4.0.9 # via gitpython -gitpython==3.1.24 +gitpython==3.1.27 # via transifex-client idna==3.3 # via requests @@ -96,11 +112,15 @@ isort==5.10.1 # via # -r requirements/quality.in # pylint -jinja2==3.0.3 +jinja2==3.1.2 # via # code-annotations + # cookiecutter # diff-cover -jmespath==0.10.0 + # jinja2-time +jinja2-time==0.2.0 + # via cookiecutter +jmespath==1.0.1 # via # boto3 # botocore @@ -108,20 +128,23 @@ lazy==1.4 # via # bok-choy # xblock + # xblock-sdk lazy-object-proxy==1.7.1 # via astroid -lxml==4.7.1 - # via xblock -mako==1.1.6 +lxml==4.9.0 + # via + # xblock + # xblock-sdk +mako==1.2.0 # via # -r requirements/base.in # xblock-utils -markupsafe==2.0.1 +markupsafe==2.1.1 # via # jinja2 # mako # xblock -mccabe==0.6.1 +mccabe==0.7.0 # via pylint mock==4.0.3 # via -r requirements/test.in @@ -132,15 +155,15 @@ packaging==21.3 # caniusepython3 # pytest # tox -path==16.2.0 +path==16.4.0 # via edx-i18n-tools -pbr==5.8.0 +pbr==5.9.0 # via stevedore pep517==0.12.0 # via pip-tools -pip-tools==6.4.0 +pip-tools==6.6.2 # via -r requirements/dev.in -platformdirs==2.4.0 +platformdirs==2.5.2 # via # pylint # virtualenv @@ -159,9 +182,9 @@ pycodestyle==2.8.0 # via -r requirements/quality.in pydocstyle==6.1.1 # via -r requirements/quality.in -pygments==2.10.0 +pygments==2.12.0 # via diff-cover -pylint==2.12.2 +pylint==2.14.3 # via # edx-lint # pylint-celery @@ -169,17 +192,19 @@ pylint==2.12.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.4.4 +pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.6 +pylint-plugin-utils==0.7 # via # pylint-celery # pylint-django -pyparsing==3.0.6 +pyparsing==3.0.9 # via packaging pypng==0.0.21 - # via -r requirements/dev.in -pytest==6.2.5 + # via + # -r requirements/dev.in + # xblock-sdk +pytest==7.1.2 # via # -r requirements/test.in # pytest-cov @@ -190,34 +215,40 @@ pytest-django==4.5.2 # via -r requirements/test.in python-dateutil==2.8.2 # via + # arrow # botocore # xblock python-slugify==4.0.1 # via # code-annotations + # cookiecutter # transifex-client -pytz==2021.3 +pytz==2022.1 # via # django - # fs # xblock pyyaml==6.0 # via # code-annotations + # cookiecutter # edx-i18n-tools # xblock -requests==2.26.0 +requests==2.28.0 # via # -r requirements/base.in # caniusepython3 + # cookiecutter # coveralls # transifex-client -s3transfer==0.5.0 + # xblock-sdk +s3transfer==0.6.0 # via boto3 selenium==3.141.0 # via bok-choy simplejson==3.17.6 - # via xblock-utils + # via + # xblock-sdk + # xblock-utils six==1.16.0 # via # bok-choy @@ -239,54 +270,58 @@ stevedore==3.5.0 text-unidecode==1.3 # via python-slugify toml==0.10.2 - # via - # pylint - # pytest - # tox -tomli==2.0.0 + # via tox +tomli==2.0.1 # via # coverage # pep517 -tox==3.24.4 + # pylint + # pytest +tomlkit==0.11.0 + # via pylint +tox==3.25.0 # via # -r requirements/travis.in # tox-battery tox-battery==0.6.1 # via -r requirements/travis.in -transifex-client==0.14.3 +transifex-client==0.14.4 # via -r requirements/dev.in -typing-extensions==4.0.1 +typing-extensions==4.2.0 # via # astroid - # gitpython # pylint -urllib3==1.26.7 +urllib3==1.26.9 # via # botocore # requests # selenium # transifex-client -virtualenv==20.10.0 +virtualenv==20.14.1 # via tox web-fragments==2.0.0 # via # xblock + # xblock-sdk # xblock-utils webob==1.8.7 - # via xblock -wheel==0.37.0 + # via + # xblock + # xblock-sdk +wheel==0.37.1 # via pip-tools -wrapt==1.13.3 +wrapt==1.14.1 # via astroid -xblock[django]==1.5.1 +xblock[django]==1.6.1 # via # -r requirements/base.in + # xblock-sdk # xblock-utils -xblock-sdk==0.4.0 +xblock-sdk==0.5.1 # via # -r requirements/dev.in # -r requirements/test.in -xblock-utils==2.2.0 +xblock-utils==3.0.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/django.txt b/requirements/django.txt index b0be5a8..09696ec 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.10 +django==3.2.13 diff --git a/requirements/pip-tools.in b/requirements/pip-tools.in new file mode 100644 index 0000000..f99de0e --- /dev/null +++ b/requirements/pip-tools.in @@ -0,0 +1,3 @@ +-c constraints.txt + +pip-tools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt new file mode 100644 index 0000000..ce56f4c --- /dev/null +++ b/requirements/pip-tools.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# make upgrade +# +click==8.1.3 + # via pip-tools +pep517==0.12.0 + # via pip-tools +pip-tools==6.6.2 + # via -r requirements/pip-tools.in +tomli==2.0.1 + # via pep517 +wheel==0.37.1 + # via pip-tools + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/requirements/pip.in b/requirements/pip.in new file mode 100644 index 0000000..148828c --- /dev/null +++ b/requirements/pip.in @@ -0,0 +1,6 @@ +-c constraints.txt +#Core dependencies for installing other packages + +pip +setuptools +wheel diff --git a/requirements/pip.txt b/requirements/pip.txt new file mode 100644 index 0000000..8a667c4 --- /dev/null +++ b/requirements/pip.txt @@ -0,0 +1,16 @@ +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# make upgrade +# +wheel==0.37.1 + # via -r requirements/pip.in + +# The following packages are considered to be unsafe in a requirements file: +pip==22.1.2 + # via -r requirements/pip.in +setuptools==59.8.0 + # via + # -c requirements/common_constraints.txt + # -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 96aefeb..23fff16 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -2,74 +2,92 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile --output-file=requirements/quality.txt requirements/base.in requirements/quality.in requirements/test.in +# make upgrade # appdirs==1.4.4 # via fs -asgiref==3.4.1 +arrow==1.2.2 + # via jinja2-time +asgiref==3.5.2 # via django -astroid==2.9.0 +astroid==2.11.6 # via # pylint # pylint-celery -attrs==21.2.0 +attrs==21.4.0 # via pytest -backports.functools-lru-cache==1.6.4 +backports-functools-lru-cache==1.6.4 # via caniusepython3 +binaryornot==0.4.4 + # via cookiecutter bok-choy==1.1.1 # via -r requirements/test.in -boto3==1.20.25 +boto==2.49.0 + # via xblock-sdk +boto3==1.24.15 # via fs-s3fs -botocore==1.23.25 +botocore==1.27.15 # via # boto3 # s3transfer caniusepython3==7.3.0 # via -r requirements/quality.in -certifi==2021.10.8 +certifi==2022.6.15 # via requests chardet==4.0.0 - # via diff-cover -charset-normalizer==2.0.9 + # via + # binaryornot + # diff-cover +charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==8.1.3 # via # click-log # code-annotations + # cookiecutter # edx-lint # pip-tools -click-log==0.3.2 +click-log==0.4.0 # via edx-lint -code-annotations==1.2.0 +code-annotations==1.3.0 # via edx-lint -coverage[toml]==6.2 +cookiecutter==2.1.1 + # via xblock-sdk +coverage[toml]==6.4.1 # via pytest-cov -ddt==1.4.4 +ddt==1.5.0 # via -r requirements/test.in -diff-cover==6.4.4 +diff-cover==6.5.1 # via -r requirements/dev.in +dill==0.3.5.1 + # via pylint distlib==0.3.4 # via caniusepython3 -django==3.2.10 +django==3.2.13 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in # django-pyfs # xblock-sdk -django-pyfs==3.1.0 - # via xblock -edx-lint==5.2.1 +django-pyfs==3.2.0 + # via + # xblock + # xblock-sdk +edx-lint==5.2.4 # via -r requirements/quality.in -fs==2.4.14 +fs==2.4.16 # via # django-pyfs # fs-s3fs # xblock fs-s3fs==1.1.1 - # via django-pyfs + # via + # django-pyfs + # xblock-sdk gitdb==4.0.9 # via gitpython -gitpython==3.1.24 +gitpython==3.1.27 # via transifex-client idna==3.3 # via requests @@ -79,11 +97,15 @@ isort==5.10.1 # via # -r requirements/quality.in # pylint -jinja2==3.0.3 +jinja2==3.1.2 # via # code-annotations + # cookiecutter # diff-cover -jmespath==0.10.0 + # jinja2-time +jinja2-time==0.2.0 + # via cookiecutter +jmespath==1.0.1 # via # boto3 # botocore @@ -91,20 +113,23 @@ lazy==1.4 # via # bok-choy # xblock + # xblock-sdk lazy-object-proxy==1.7.1 # via astroid -lxml==4.7.1 - # via xblock -mako==1.1.6 +lxml==4.9.0 + # via + # xblock + # xblock-sdk +mako==1.2.0 # via # -r requirements/base.in # xblock-utils -markupsafe==2.0.1 +markupsafe==2.1.1 # via # jinja2 # mako # xblock -mccabe==0.6.1 +mccabe==0.7.0 # via pylint mock==4.0.3 # via -r requirements/test.in @@ -114,13 +139,13 @@ packaging==21.3 # via # caniusepython3 # pytest -pbr==5.8.0 +pbr==5.9.0 # via stevedore pep517==0.12.0 # via pip-tools -pip-tools==6.4.0 +pip-tools==6.6.2 # via -r requirements/dev.in -platformdirs==2.4.0 +platformdirs==2.5.2 # via pylint pluggy==1.0.0 # via @@ -132,9 +157,9 @@ pycodestyle==2.8.0 # via -r requirements/quality.in pydocstyle==6.1.1 # via -r requirements/quality.in -pygments==2.10.0 +pygments==2.12.0 # via diff-cover -pylint==2.12.2 +pylint==2.14.3 # via # edx-lint # pylint-celery @@ -142,17 +167,19 @@ pylint==2.12.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.4.4 +pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.6 +pylint-plugin-utils==0.7 # via # pylint-celery # pylint-django -pyparsing==3.0.6 +pyparsing==3.0.9 # via packaging pypng==0.0.21 - # via -r requirements/dev.in -pytest==6.2.5 + # via + # -r requirements/dev.in + # xblock-sdk +pytest==7.1.2 # via # -r requirements/test.in # pytest-cov @@ -163,32 +190,38 @@ pytest-django==4.5.2 # via -r requirements/test.in python-dateutil==2.8.2 # via + # arrow # botocore # xblock python-slugify==4.0.1 # via # code-annotations + # cookiecutter # transifex-client -pytz==2021.3 +pytz==2022.1 # via # django - # fs # xblock pyyaml==6.0 # via # code-annotations + # cookiecutter # xblock -requests==2.26.0 +requests==2.28.0 # via # -r requirements/base.in # caniusepython3 + # cookiecutter # transifex-client -s3transfer==0.5.0 + # xblock-sdk +s3transfer==0.6.0 # via boto3 selenium==3.141.0 # via bok-choy simplejson==3.17.6 - # via xblock-utils + # via + # xblock-sdk + # xblock-utils six==1.16.0 # via # bok-choy @@ -207,22 +240,21 @@ stevedore==3.5.0 # via code-annotations text-unidecode==1.3 # via python-slugify -toml==0.10.2 - # via - # pylint - # pytest -tomli==2.0.0 +tomli==2.0.1 # via # coverage # pep517 -transifex-client==0.14.3 + # pylint + # pytest +tomlkit==0.11.0 + # via pylint +transifex-client==0.14.4 # via -r requirements/dev.in -typing-extensions==4.0.1 +typing-extensions==4.2.0 # via # astroid - # gitpython # pylint -urllib3==1.26.7 +urllib3==1.26.9 # via # botocore # requests @@ -231,22 +263,26 @@ urllib3==1.26.7 web-fragments==2.0.0 # via # xblock + # xblock-sdk # xblock-utils webob==1.8.7 - # via xblock -wheel==0.37.0 + # via + # xblock + # xblock-sdk +wheel==0.37.1 # via pip-tools -wrapt==1.13.3 +wrapt==1.14.1 # via astroid -xblock[django]==1.5.1 +xblock[django]==1.6.1 # via # -r requirements/base.in + # xblock-sdk # xblock-utils -xblock-sdk==0.4.0 +xblock-sdk==0.5.1 # via # -r requirements/dev.in # -r requirements/test.in -xblock-utils==2.2.0 +xblock-utils==3.0.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 68cfa06..339af5c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -2,61 +2,83 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile --output-file=requirements/test.txt requirements/base.in requirements/test.in +# make upgrade # appdirs==1.4.4 # via fs -asgiref==3.4.1 +arrow==1.2.2 + # via jinja2-time +asgiref==3.5.2 # via django -attrs==21.2.0 +attrs==21.4.0 # via pytest +binaryornot==0.4.4 + # via cookiecutter bok-choy==1.1.1 # via -r requirements/test.in -boto3==1.20.25 +boto==2.49.0 + # via xblock-sdk +boto3==1.24.15 # via fs-s3fs -botocore==1.23.25 +botocore==1.27.15 # via # boto3 # s3transfer -certifi==2021.10.8 +certifi==2022.6.15 # via requests chardet==4.0.0 - # via diff-cover -charset-normalizer==2.0.9 + # via + # binaryornot + # diff-cover +charset-normalizer==2.0.12 # via requests -click==8.0.3 - # via pip-tools -coverage[toml]==6.2 +click==8.1.3 + # via + # cookiecutter + # pip-tools +cookiecutter==2.1.1 + # via xblock-sdk +coverage[toml]==6.4.1 # via pytest-cov -ddt==1.4.4 +ddt==1.5.0 # via -r requirements/test.in -diff-cover==6.4.4 +diff-cover==6.5.1 # via -r requirements/dev.in # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # -r requirements/base.in # django-pyfs # xblock-sdk -django-pyfs==3.1.0 - # via xblock -fs==2.4.14 +django-pyfs==3.2.0 + # via + # xblock + # xblock-sdk +fs==2.4.16 # via # django-pyfs # fs-s3fs # xblock fs-s3fs==1.1.1 - # via django-pyfs + # via + # django-pyfs + # xblock-sdk gitdb==4.0.9 # via gitpython -gitpython==3.1.24 +gitpython==3.1.27 # via transifex-client idna==3.3 # via requests iniconfig==1.1.1 # via pytest -jinja2==3.0.3 - # via diff-cover -jmespath==0.10.0 +jinja2==3.1.2 + # via + # cookiecutter + # diff-cover + # jinja2-time +jinja2-time==0.2.0 + # via cookiecutter +jmespath==1.0.1 # via # boto3 # botocore @@ -64,13 +86,16 @@ lazy==1.4 # via # bok-choy # xblock -lxml==4.7.1 - # via xblock -mako==1.1.6 + # xblock-sdk +lxml==4.9.0 + # via + # xblock + # xblock-sdk +mako==1.2.0 # via # -r requirements/base.in # xblock-utils -markupsafe==2.0.1 +markupsafe==2.1.1 # via # jinja2 # mako @@ -83,7 +108,7 @@ packaging==21.3 # via pytest pep517==0.12.0 # via pip-tools -pip-tools==6.4.0 +pip-tools==6.6.2 # via -r requirements/dev.in pluggy==1.0.0 # via @@ -91,13 +116,15 @@ pluggy==1.0.0 # pytest py==1.11.0 # via pytest -pygments==2.10.0 +pygments==2.12.0 # via diff-cover -pyparsing==3.0.6 +pyparsing==3.0.9 # via packaging pypng==0.0.21 - # via -r requirements/dev.in -pytest==6.2.5 + # via + # -r requirements/dev.in + # xblock-sdk +pytest==7.1.2 # via # -r requirements/test.in # pytest-cov @@ -108,27 +135,35 @@ pytest-django==4.5.2 # via -r requirements/test.in python-dateutil==2.8.2 # via + # arrow # botocore # xblock python-slugify==4.0.1 - # via transifex-client -pytz==2021.3 + # via + # cookiecutter + # transifex-client +pytz==2022.1 # via # django - # fs # xblock pyyaml==6.0 - # via xblock -requests==2.26.0 + # via + # cookiecutter + # xblock +requests==2.28.0 # via # -r requirements/base.in + # cookiecutter # transifex-client -s3transfer==0.5.0 + # xblock-sdk +s3transfer==0.6.0 # via boto3 selenium==3.141.0 # via bok-choy simplejson==3.17.6 - # via xblock-utils + # via + # xblock-sdk + # xblock-utils six==1.16.0 # via # bok-choy @@ -142,17 +177,14 @@ sqlparse==0.4.2 # via django text-unidecode==1.3 # via python-slugify -toml==0.10.2 - # via pytest -tomli==2.0.0 +tomli==2.0.1 # via # coverage # pep517 -transifex-client==0.14.3 + # pytest +transifex-client==0.14.4 # via -r requirements/dev.in -typing-extensions==4.0.1 - # via gitpython -urllib3==1.26.7 +urllib3==1.26.9 # via # botocore # requests @@ -161,20 +193,24 @@ urllib3==1.26.7 web-fragments==2.0.0 # via # xblock + # xblock-sdk # xblock-utils webob==1.8.7 - # via xblock -wheel==0.37.0 + # via + # xblock + # xblock-sdk +wheel==0.37.1 # via pip-tools -xblock[django]==1.5.1 +xblock[django]==1.6.1 # via # -r requirements/base.in + # xblock-sdk # xblock-utils -xblock-sdk==0.4.0 +xblock-sdk==0.5.1 # via # -r requirements/dev.in # -r requirements/test.in -xblock-utils==2.2.0 +xblock-utils==3.0.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/travis.txt b/requirements/travis.txt index 1bf426f..403bfab 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -2,31 +2,30 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile --output-file=requirements/travis.txt requirements/travis.in +# make upgrade # -asgiref==3.4.1 +asgiref==3.5.2 # via django -backports.entry-points-selectable==1.1.1 - # via virtualenv -certifi==2021.10.8 +certifi==2022.6.15 # via requests -charset-normalizer==2.0.9 +charset-normalizer==2.0.12 # via requests -coverage==6.2 +coverage==6.4.1 # via coveralls coveralls==3.3.1 # via -r requirements/travis.in distlib==0.3.4 # via virtualenv -django==3.2.10 +django==3.2.13 # via + # -c requirements/common_constraints.txt # -c requirements/constraints.txt # edx-i18n-tools docopt==0.6.2 # via coveralls -edx-i18n-tools==0.8.1 +edx-i18n-tools==0.9.1 # via -r requirements/travis.in -filelock==3.4.0 +filelock==3.7.1 # via # tox # virtualenv @@ -34,9 +33,9 @@ idna==3.3 # via requests packaging==21.3 # via tox -path==16.2.0 +path==16.4.0 # via edx-i18n-tools -platformdirs==2.4.0 +platformdirs==2.5.2 # via virtualenv pluggy==1.0.0 # via tox @@ -44,13 +43,13 @@ polib==1.1.1 # via edx-i18n-tools py==1.11.0 # via tox -pyparsing==3.0.6 +pyparsing==3.0.9 # via packaging -pytz==2021.3 +pytz==2022.1 # via django pyyaml==6.0 # via edx-i18n-tools -requests==2.26.0 +requests==2.28.0 # via coveralls six==1.16.0 # via @@ -60,13 +59,13 @@ sqlparse==0.4.2 # via django toml==0.10.2 # via tox -tox==3.24.4 +tox==3.25.0 # via # -r requirements/travis.in # tox-battery tox-battery==0.6.1 # via -r requirements/travis.in -urllib3==1.26.7 +urllib3==1.26.9 # via requests -virtualenv==20.10.0 +virtualenv==20.14.1 # via tox From f0485efd83f714f349a07d1cb084b1f093f17b9a Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Tue, 25 Oct 2022 13:19:38 +0500 Subject: [PATCH 2/2] fix: fix --- pylintrc | 385 ---------------------------- requirements/ci.txt | 36 ++- requirements/common_constraints.txt | 2 + requirements/dev.txt | 103 ++++---- requirements/django.txt | 2 +- requirements/pip-tools.txt | 16 +- requirements/pip.txt | 2 +- requirements/quality.txt | 89 +++---- requirements/test.txt | 63 ++--- requirements/travis.txt | 36 ++- 10 files changed, 180 insertions(+), 554 deletions(-) delete mode 100644 pylintrc diff --git a/pylintrc b/pylintrc deleted file mode 100644 index e2e1a3a..0000000 --- a/pylintrc +++ /dev/null @@ -1,385 +0,0 @@ -# *************************** -# ** DO NOT EDIT THIS FILE ** -# *************************** -# -# This file was generated by edx-lint: https://github.com/edx/edx-lint -# -# If you want to change this file, you have two choices, depending on whether -# you want to make a local change that applies only to this repo, or whether -# you want to make a central change that applies to all repos using edx-lint. -# -# Note: If your pylintrc file is simply out-of-date relative to the latest -# pylintrc in edx-lint, ensure you have the latest edx-lint installed -# and then follow the steps for a "LOCAL CHANGE". -# -# LOCAL CHANGE: -# -# 1. Edit the local pylintrc_tweaks file to add changes just to this -# repo's file. -# -# 2. Run: -# -# $ edx_lint write pylintrc -# -# 3. This will modify the local file. Submit a pull request to get it -# checked in so that others will benefit. -# -# -# CENTRAL CHANGE: -# -# 1. Edit the pylintrc file in the edx-lint repo at -# https://github.com/edx/edx-lint/blob/master/edx_lint/files/pylintrc -# -# 2. install the updated version of edx-lint (in edx-lint): -# -# $ pip install . -# -# 3. Run (in edx-lint): -# -# $ edx_lint write pylintrc -# -# 4. Make a new version of edx_lint, submit and review a pull request with the -# pylintrc update, and after merging, update the edx-lint version and -# publish the new version. -# -# 5. In your local repo, install the newer version of edx-lint. -# -# 6. Run: -# -# $ edx_lint write pylintrc -# -# 7. This will modify the local file. Submit a pull request to get it -# checked in so that others will benefit. -# -# -# -# -# -# STAY AWAY FROM THIS FILE! -# -# -# -# -# -# SERIOUSLY. -# -# ------------------------------ -# Generated by edx-lint version: 5.2.4 -# ------------------------------ -[MASTER] -ignore = -persistent = yes -load-plugins = edx_lint.pylint,pylint_django,pylint_celery - -[MESSAGES CONTROL] -enable = - blacklisted-name, - line-too-long, - - abstract-class-instantiated, - abstract-method, - access-member-before-definition, - anomalous-backslash-in-string, - anomalous-unicode-escape-in-string, - arguments-differ, - assert-on-tuple, - assigning-non-slot, - assignment-from-no-return, - assignment-from-none, - attribute-defined-outside-init, - bad-except-order, - bad-format-character, - bad-format-string-key, - bad-format-string, - bad-open-mode, - bad-reversed-sequence, - bad-staticmethod-argument, - bad-str-strip-call, - bad-super-call, - binary-op-exception, - boolean-datetime, - catching-non-exception, - cell-var-from-loop, - confusing-with-statement, - continue-in-finally, - dangerous-default-value, - duplicate-argument-name, - duplicate-bases, - duplicate-except, - duplicate-key, - expression-not-assigned, - format-combined-specification, - format-needs-mapping, - function-redefined, - global-variable-undefined, - import-error, - import-self, - inconsistent-mro, - inherit-non-class, - init-is-generator, - invalid-all-object, - invalid-format-index, - invalid-length-returned, - invalid-sequence-index, - invalid-slice-index, - invalid-slots-object, - invalid-slots, - invalid-unary-operand-type, - logging-too-few-args, - logging-too-many-args, - logging-unsupported-format, - lost-exception, - method-hidden, - misplaced-bare-raise, - misplaced-future, - missing-format-argument-key, - missing-format-attribute, - missing-format-string-key, - no-member, - no-method-argument, - no-name-in-module, - no-self-argument, - no-value-for-parameter, - non-iterator-returned, - non-parent-method-called, - nonexistent-operator, - not-a-mapping, - not-an-iterable, - not-callable, - not-context-manager, - not-in-loop, - pointless-statement, - pointless-string-statement, - raising-bad-type, - raising-non-exception, - redefined-builtin, - redefined-outer-name, - redundant-keyword-arg, - repeated-keyword, - return-arg-in-generator, - return-in-init, - return-outside-function, - signature-differs, - super-init-not-called, - super-method-not-called, - syntax-error, - test-inherits-tests, - too-few-format-args, - too-many-format-args, - too-many-function-args, - translation-of-non-string, - truncated-format-string, - undefined-all-variable, - undefined-loop-variable, - undefined-variable, - unexpected-keyword-arg, - unexpected-special-method-signature, - unpacking-non-sequence, - unreachable, - unsubscriptable-object, - unsupported-binary-operation, - unsupported-membership-test, - unused-format-string-argument, - unused-format-string-key, - used-before-assignment, - using-constant-test, - yield-outside-function, - - astroid-error, - fatal, - method-check-failed, - parse-error, - raw-checker-failed, - - empty-docstring, - invalid-characters-in-docstring, - missing-docstring, - wrong-spelling-in-comment, - wrong-spelling-in-docstring, - - unused-argument, - unused-import, - unused-variable, - - eval-used, - exec-used, - - bad-classmethod-argument, - bad-mcs-classmethod-argument, - bad-mcs-method-argument, - bare-except, - broad-except, - consider-iterating-dictionary, - consider-using-enumerate, - global-at-module-level, - global-variable-not-assigned, - literal-used-as-attribute, - logging-format-interpolation, - logging-not-lazy, - multiple-imports, - multiple-statements, - no-classmethod-decorator, - no-staticmethod-decorator, - protected-access, - redundant-unittest-assert, - reimported, - simplifiable-if-statement, - simplifiable-range, - singleton-comparison, - superfluous-parens, - unidiomatic-typecheck, - unnecessary-lambda, - unnecessary-pass, - unnecessary-semicolon, - unneeded-not, - useless-else-on-loop, - wrong-assert-type, - - deprecated-method, - deprecated-module, - - too-many-boolean-expressions, - too-many-nested-blocks, - too-many-statements, - - wildcard-import, - wrong-import-order, - wrong-import-position, - - missing-final-newline, - mixed-line-endings, - trailing-newlines, - trailing-whitespace, - unexpected-line-ending-format, - - bad-inline-option, - bad-option-value, - deprecated-pragma, - unrecognized-inline-option, - useless-suppression, -disable = - bad-indentation, - consider-using-f-string, - duplicate-code, - file-ignored, - fixme, - global-statement, - invalid-name, - locally-disabled, - no-else-return, - suppressed-message, - too-few-public-methods, - too-many-ancestors, - too-many-arguments, - too-many-branches, - too-many-instance-attributes, - too-many-lines, - too-many-locals, - too-many-public-methods, - too-many-return-statements, - ungrouped-imports, - unspecified-encoding, - unused-wildcard-import, - use-maxsplit-arg, - - feature-toggle-needs-doc, - illegal-waffle-usage, - - logging-fstring-interpolation, - -[REPORTS] -output-format = text -reports = no -score = no - -[BASIC] -module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ -const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$ -class-rgx = [A-Z_][a-zA-Z0-9]+$ -function-rgx = ([a-z_][a-z0-9_]{2,40}|test_[a-z0-9_]+)$ -method-rgx = ([a-z_][a-z0-9_]{2,40}|setUp|set[Uu]pClass|tearDown|tear[Dd]ownClass|assert[A-Z]\w*|maxDiff|test_[a-z0-9_]+)$ -attr-rgx = [a-z_][a-z0-9_]{2,30}$ -argument-rgx = [a-z_][a-z0-9_]{2,30}$ -variable-rgx = [a-z_][a-z0-9_]{2,30}$ -class-attribute-rgx = ([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ -inlinevar-rgx = [A-Za-z_][A-Za-z0-9_]*$ -good-names = f,i,j,k,db,ex,Run,_,__ -bad-names = foo,bar,baz,toto,tutu,tata -no-docstring-rgx = __.*__$|test_.+|setUp$|setUpClass$|tearDown$|tearDownClass$|Meta$ -docstring-min-length = 5 - -[FORMAT] -max-line-length = 120 -ignore-long-lines = ^\s*(# )?((?)|(\.\. \w+: .*))$ -single-line-if-stmt = no -max-module-lines = 1000 -indent-string = ' ' - -[MISCELLANEOUS] -notes = FIXME,XXX,TODO - -[SIMILARITIES] -min-similarity-lines = 4 -ignore-comments = yes -ignore-docstrings = yes -ignore-imports = no - -[TYPECHECK] -ignore-mixin-members = yes -ignored-classes = SQLObject -unsafe-load-any-extension = yes -generated-members = - REQUEST, - acl_users, - aq_parent, - objects, - DoesNotExist, - can_read, - can_write, - get_url, - size, - content, - status_code, - create, - build, - fields, - tag, - org, - course, - category, - name, - revision, - _meta, - -[VARIABLES] -init-import = no -dummy-variables-rgx = _|dummy|unused|.*_unused -additional-builtins = - -[CLASSES] -defining-attr-methods = __init__,__new__,setUp -valid-classmethod-first-arg = cls -valid-metaclass-classmethod-first-arg = mcs - -[DESIGN] -max-args = 5 -ignored-argument-names = _.* -max-locals = 15 -max-returns = 6 -max-branches = 12 -max-statements = 50 -max-parents = 7 -max-attributes = 7 -min-public-methods = 2 -max-public-methods = 20 - -[IMPORTS] -deprecated-modules = regsub,TERMIOS,Bastion,rexec -import-graph = -ext-import-graph = -int-import-graph = - -[EXCEPTIONS] -overgeneral-exceptions = Exception - -# fad4071fe38e655a180214bd3f6bce3ffa41b2ed diff --git a/requirements/ci.txt b/requirements/ci.txt index f16bbcb..1abdadf 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,34 +6,34 @@ # asgiref==3.5.2 # via django -certifi==2022.6.15 +certifi==2022.9.24 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.1 # via requests -coverage==6.4.1 +coverage==6.5.0 # via coveralls coveralls==3.3.1 # via -r requirements/ci.in -distlib==0.3.4 +distlib==0.3.6 # via virtualenv -django==3.2.13 +django==3.2.16 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt # edx-i18n-tools docopt==0.6.2 # via coveralls -edx-i18n-tools==0.9.1 +edx-i18n-tools==0.9.2 # via -r requirements/ci.in -filelock==3.7.1 +filelock==3.8.0 # via # tox # virtualenv -idna==3.3 +idna==3.4 # via requests packaging==21.3 # via tox -path==16.4.0 +path==16.5.0 # via edx-i18n-tools platformdirs==2.5.2 # via virtualenv @@ -45,27 +45,25 @@ py==1.11.0 # via tox pyparsing==3.0.9 # via packaging -pytz==2022.1 +pytz==2022.5 # via django pyyaml==6.0 # via edx-i18n-tools -requests==2.28.0 +requests==2.28.1 # via coveralls six==1.16.0 - # via - # tox - # virtualenv -sqlparse==0.4.2 + # via tox +sqlparse==0.4.3 # via django -toml==0.10.2 +tomli==2.0.1 # via tox -tox==3.25.0 +tox==3.26.0 # via # -r requirements/ci.in # tox-battery tox-battery==0.6.1 # via -r requirements/ci.in -urllib3==1.26.9 +urllib3==1.26.12 # via requests -virtualenv==20.14.1 +virtualenv==20.16.5 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index cca3ccd..b1dfdf0 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -19,6 +19,8 @@ Django<4.0 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html elasticsearch<7.14.0 +# setuptools==60.0 had breaking changes and busted several service's pipeline. +# Details can be found here: https://github.com/pypa/setuptools/issues/2940 setuptools<60 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected diff --git a/requirements/dev.txt b/requirements/dev.txt index 0fd5de5..7f3a6a2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,15 +6,15 @@ # appdirs==1.4.4 # via fs -arrow==1.2.2 +arrow==1.2.3 # via jinja2-time asgiref==3.5.2 # via django -astroid==2.11.6 +astroid==2.9.3 # via # pylint # pylint-celery -attrs==21.4.0 +attrs==22.1.0 # via pytest backports-functools-lru-cache==1.6.4 # via caniusepython3 @@ -24,21 +24,23 @@ bok-choy==1.1.1 # via -r requirements/test.in boto==2.49.0 # via xblock-sdk -boto3==1.24.15 +boto3==1.25.0 # via fs-s3fs -botocore==1.27.15 +botocore==1.28.0 # via # boto3 # s3transfer +build==0.8.0 + # via pip-tools caniusepython3==7.3.0 # via -r requirements/quality.in -certifi==2022.6.15 +certifi==2022.9.24 # via requests -chardet==4.0.0 +chardet==5.0.0 # via # binaryornot # diff-cover -charset-normalizer==2.0.12 +charset-normalizer==2.1.1 # via requests click==8.1.3 # via @@ -53,23 +55,21 @@ code-annotations==1.3.0 # via edx-lint cookiecutter==2.1.1 # via xblock-sdk -coverage[toml]==6.4.1 +coverage[toml]==6.5.0 # via # coveralls # pytest-cov coveralls==3.3.1 # via -r requirements/travis.in -ddt==1.5.0 +ddt==1.6.0 # via -r requirements/test.in -diff-cover==6.5.1 +diff-cover==7.0.1 # via -r requirements/dev.in -dill==0.3.5.1 - # via pylint -distlib==0.3.4 +distlib==0.3.6 # via # caniusepython3 # virtualenv -django==3.2.13 +django==3.2.16 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -83,11 +83,13 @@ django-pyfs==3.2.0 # xblock-sdk docopt==0.6.2 # via coveralls -edx-i18n-tools==0.9.1 +edx-i18n-tools==0.9.2 # via -r requirements/travis.in -edx-lint==5.2.4 +edx-lint==5.3.0 # via -r requirements/quality.in -filelock==3.7.1 +exceptiongroup==1.0.0rc9 + # via pytest +filelock==3.8.0 # via # tox # virtualenv @@ -102,9 +104,9 @@ fs-s3fs==1.1.1 # xblock-sdk gitdb==4.0.9 # via gitpython -gitpython==3.1.27 +gitpython==3.1.29 # via transifex-client -idna==3.3 +idna==3.4 # via requests iniconfig==1.1.1 # via pytest @@ -124,18 +126,18 @@ jmespath==1.0.1 # via # boto3 # botocore -lazy==1.4 +lazy==1.5 # via # bok-choy # xblock # xblock-sdk lazy-object-proxy==1.7.1 # via astroid -lxml==4.9.0 +lxml==4.9.1 # via # xblock # xblock-sdk -mako==1.2.0 +mako==1.2.3 # via # -r requirements/base.in # xblock-utils @@ -144,7 +146,7 @@ markupsafe==2.1.1 # jinja2 # mako # xblock -mccabe==0.7.0 +mccabe==0.6.1 # via pylint mock==4.0.3 # via -r requirements/test.in @@ -152,16 +154,17 @@ nose==1.3.7 # via -r requirements/test.in packaging==21.3 # via + # build # caniusepython3 # pytest # tox -path==16.4.0 +path==16.5.0 # via edx-i18n-tools -pbr==5.9.0 +pbr==5.11.0 # via stevedore -pep517==0.12.0 - # via pip-tools -pip-tools==6.6.2 +pep517==0.13.0 + # via build +pip-tools==6.9.0 # via -r requirements/dev.in platformdirs==2.5.2 # via @@ -175,16 +178,14 @@ pluggy==1.0.0 polib==1.1.1 # via edx-i18n-tools py==1.11.0 - # via - # pytest - # tox -pycodestyle==2.8.0 + # via tox +pycodestyle==2.9.1 # via -r requirements/quality.in pydocstyle==6.1.1 # via -r requirements/quality.in -pygments==2.12.0 +pygments==2.13.0 # via diff-cover -pylint==2.14.3 +pylint==2.12.2 # via # edx-lint # pylint-celery @@ -200,16 +201,16 @@ pylint-plugin-utils==0.7 # pylint-django pyparsing==3.0.9 # via packaging -pypng==0.0.21 +pypng==0.20220715.0 # via # -r requirements/dev.in # xblock-sdk -pytest==7.1.2 +pytest==7.2.0 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==3.0.0 +pytest-cov==4.0.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -223,7 +224,7 @@ python-slugify==4.0.1 # code-annotations # cookiecutter # transifex-client -pytz==2022.1 +pytz==2022.5 # via # django # xblock @@ -233,7 +234,7 @@ pyyaml==6.0 # cookiecutter # edx-i18n-tools # xblock -requests==2.28.0 +requests==2.28.1 # via # -r requirements/base.in # caniusepython3 @@ -258,28 +259,26 @@ six==1.16.0 # python-dateutil # tox # transifex-client - # virtualenv smmap==5.0.0 # via gitdb snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.2 +sqlparse==0.4.3 # via django -stevedore==3.5.0 +stevedore==4.1.0 # via code-annotations text-unidecode==1.3 # via python-slugify toml==0.10.2 - # via tox + # via pylint tomli==2.0.1 # via + # build # coverage # pep517 - # pylint # pytest -tomlkit==0.11.0 - # via pylint -tox==3.25.0 + # tox +tox==3.26.0 # via # -r requirements/travis.in # tox-battery @@ -287,17 +286,17 @@ tox-battery==0.6.1 # via -r requirements/travis.in transifex-client==0.14.4 # via -r requirements/dev.in -typing-extensions==4.2.0 +typing-extensions==4.4.0 # via # astroid # pylint -urllib3==1.26.9 +urllib3==1.26.12 # via # botocore # requests # selenium # transifex-client -virtualenv==20.14.1 +virtualenv==20.16.5 # via tox web-fragments==2.0.0 # via @@ -310,7 +309,7 @@ webob==1.8.7 # xblock-sdk wheel==0.37.1 # via pip-tools -wrapt==1.14.1 +wrapt==1.13.3 # via astroid xblock[django]==1.6.1 # via diff --git a/requirements/django.txt b/requirements/django.txt index 09696ec..e92ee8e 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.13 +django==3.2.16 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index ce56f4c..ad0968f 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,14 +4,22 @@ # # make upgrade # -click==8.1.3 +build==0.8.0 # via pip-tools -pep517==0.12.0 +click==8.1.3 # via pip-tools -pip-tools==6.6.2 +packaging==21.3 + # via build +pep517==0.13.0 + # via build +pip-tools==6.9.0 # via -r requirements/pip-tools.in +pyparsing==3.0.9 + # via packaging tomli==2.0.1 - # via pep517 + # via + # build + # pep517 wheel==0.37.1 # via pip-tools diff --git a/requirements/pip.txt b/requirements/pip.txt index 8a667c4..e50ba06 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.37.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.1.2 +pip==22.3 # via -r requirements/pip.in setuptools==59.8.0 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index 23fff16..cf60511 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -6,15 +6,15 @@ # appdirs==1.4.4 # via fs -arrow==1.2.2 +arrow==1.2.3 # via jinja2-time asgiref==3.5.2 # via django -astroid==2.11.6 +astroid==2.9.3 # via # pylint # pylint-celery -attrs==21.4.0 +attrs==22.1.0 # via pytest backports-functools-lru-cache==1.6.4 # via caniusepython3 @@ -24,21 +24,23 @@ bok-choy==1.1.1 # via -r requirements/test.in boto==2.49.0 # via xblock-sdk -boto3==1.24.15 +boto3==1.25.0 # via fs-s3fs -botocore==1.27.15 +botocore==1.28.0 # via # boto3 # s3transfer +build==0.8.0 + # via pip-tools caniusepython3==7.3.0 # via -r requirements/quality.in -certifi==2022.6.15 +certifi==2022.9.24 # via requests -chardet==4.0.0 +chardet==5.0.0 # via # binaryornot # diff-cover -charset-normalizer==2.0.12 +charset-normalizer==2.1.1 # via requests click==8.1.3 # via @@ -53,17 +55,15 @@ code-annotations==1.3.0 # via edx-lint cookiecutter==2.1.1 # via xblock-sdk -coverage[toml]==6.4.1 +coverage[toml]==6.5.0 # via pytest-cov -ddt==1.5.0 +ddt==1.6.0 # via -r requirements/test.in -diff-cover==6.5.1 +diff-cover==7.0.1 # via -r requirements/dev.in -dill==0.3.5.1 - # via pylint -distlib==0.3.4 +distlib==0.3.6 # via caniusepython3 -django==3.2.13 +django==3.2.16 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -74,8 +74,10 @@ django-pyfs==3.2.0 # via # xblock # xblock-sdk -edx-lint==5.2.4 +edx-lint==5.3.0 # via -r requirements/quality.in +exceptiongroup==1.0.0rc9 + # via pytest fs==2.4.16 # via # django-pyfs @@ -87,9 +89,9 @@ fs-s3fs==1.1.1 # xblock-sdk gitdb==4.0.9 # via gitpython -gitpython==3.1.27 +gitpython==3.1.29 # via transifex-client -idna==3.3 +idna==3.4 # via requests iniconfig==1.1.1 # via pytest @@ -109,18 +111,18 @@ jmespath==1.0.1 # via # boto3 # botocore -lazy==1.4 +lazy==1.5 # via # bok-choy # xblock # xblock-sdk lazy-object-proxy==1.7.1 # via astroid -lxml==4.9.0 +lxml==4.9.1 # via # xblock # xblock-sdk -mako==1.2.0 +mako==1.2.3 # via # -r requirements/base.in # xblock-utils @@ -129,7 +131,7 @@ markupsafe==2.1.1 # jinja2 # mako # xblock -mccabe==0.7.0 +mccabe==0.6.1 # via pylint mock==4.0.3 # via -r requirements/test.in @@ -137,13 +139,14 @@ nose==1.3.7 # via -r requirements/test.in packaging==21.3 # via + # build # caniusepython3 # pytest -pbr==5.9.0 +pbr==5.11.0 # via stevedore -pep517==0.12.0 - # via pip-tools -pip-tools==6.6.2 +pep517==0.13.0 + # via build +pip-tools==6.9.0 # via -r requirements/dev.in platformdirs==2.5.2 # via pylint @@ -151,15 +154,13 @@ pluggy==1.0.0 # via # diff-cover # pytest -py==1.11.0 - # via pytest -pycodestyle==2.8.0 +pycodestyle==2.9.1 # via -r requirements/quality.in pydocstyle==6.1.1 # via -r requirements/quality.in -pygments==2.12.0 +pygments==2.13.0 # via diff-cover -pylint==2.14.3 +pylint==2.12.2 # via # edx-lint # pylint-celery @@ -175,16 +176,16 @@ pylint-plugin-utils==0.7 # pylint-django pyparsing==3.0.9 # via packaging -pypng==0.0.21 +pypng==0.20220715.0 # via # -r requirements/dev.in # xblock-sdk -pytest==7.1.2 +pytest==7.2.0 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==3.0.0 +pytest-cov==4.0.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -198,7 +199,7 @@ python-slugify==4.0.1 # code-annotations # cookiecutter # transifex-client -pytz==2022.1 +pytz==2022.5 # via # django # xblock @@ -207,7 +208,7 @@ pyyaml==6.0 # code-annotations # cookiecutter # xblock -requests==2.28.0 +requests==2.28.1 # via # -r requirements/base.in # caniusepython3 @@ -234,27 +235,27 @@ smmap==5.0.0 # via gitdb snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.4.2 +sqlparse==0.4.3 # via django -stevedore==3.5.0 +stevedore==4.1.0 # via code-annotations text-unidecode==1.3 # via python-slugify +toml==0.10.2 + # via pylint tomli==2.0.1 # via + # build # coverage # pep517 - # pylint # pytest -tomlkit==0.11.0 - # via pylint transifex-client==0.14.4 # via -r requirements/dev.in -typing-extensions==4.2.0 +typing-extensions==4.4.0 # via # astroid # pylint -urllib3==1.26.9 +urllib3==1.26.12 # via # botocore # requests @@ -271,7 +272,7 @@ webob==1.8.7 # xblock-sdk wheel==0.37.1 # via pip-tools -wrapt==1.14.1 +wrapt==1.13.3 # via astroid xblock[django]==1.6.1 # via diff --git a/requirements/test.txt b/requirements/test.txt index 339af5c..bdb0889 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,11 +6,11 @@ # appdirs==1.4.4 # via fs -arrow==1.2.2 +arrow==1.2.3 # via jinja2-time asgiref==3.5.2 # via django -attrs==21.4.0 +attrs==22.1.0 # via pytest binaryornot==0.4.4 # via cookiecutter @@ -18,19 +18,21 @@ bok-choy==1.1.1 # via -r requirements/test.in boto==2.49.0 # via xblock-sdk -boto3==1.24.15 +boto3==1.25.0 # via fs-s3fs -botocore==1.27.15 +botocore==1.28.0 # via # boto3 # s3transfer -certifi==2022.6.15 +build==0.8.0 + # via pip-tools +certifi==2022.9.24 # via requests -chardet==4.0.0 +chardet==5.0.0 # via # binaryornot # diff-cover -charset-normalizer==2.0.12 +charset-normalizer==2.1.1 # via requests click==8.1.3 # via @@ -38,11 +40,11 @@ click==8.1.3 # pip-tools cookiecutter==2.1.1 # via xblock-sdk -coverage[toml]==6.4.1 +coverage[toml]==6.5.0 # via pytest-cov -ddt==1.5.0 +ddt==1.6.0 # via -r requirements/test.in -diff-cover==6.5.1 +diff-cover==7.0.1 # via -r requirements/dev.in # via # -c requirements/common_constraints.txt @@ -54,6 +56,8 @@ django-pyfs==3.2.0 # via # xblock # xblock-sdk +exceptiongroup==1.0.0rc9 + # via pytest fs==2.4.16 # via # django-pyfs @@ -65,9 +69,9 @@ fs-s3fs==1.1.1 # xblock-sdk gitdb==4.0.9 # via gitpython -gitpython==3.1.27 +gitpython==3.1.29 # via transifex-client -idna==3.3 +idna==3.4 # via requests iniconfig==1.1.1 # via pytest @@ -82,16 +86,16 @@ jmespath==1.0.1 # via # boto3 # botocore -lazy==1.4 +lazy==1.5 # via # bok-choy # xblock # xblock-sdk -lxml==4.9.0 +lxml==4.9.1 # via # xblock # xblock-sdk -mako==1.2.0 +mako==1.2.3 # via # -r requirements/base.in # xblock-utils @@ -105,31 +109,31 @@ mock==4.0.3 nose==1.3.7 # via -r requirements/test.in packaging==21.3 - # via pytest -pep517==0.12.0 - # via pip-tools -pip-tools==6.6.2 + # via + # build + # pytest +pep517==0.13.0 + # via build +pip-tools==6.9.0 # via -r requirements/dev.in pluggy==1.0.0 # via # diff-cover # pytest -py==1.11.0 - # via pytest -pygments==2.12.0 +pygments==2.13.0 # via diff-cover pyparsing==3.0.9 # via packaging -pypng==0.0.21 +pypng==0.20220715.0 # via # -r requirements/dev.in # xblock-sdk -pytest==7.1.2 +pytest==7.2.0 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==3.0.0 +pytest-cov==4.0.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -142,7 +146,7 @@ python-slugify==4.0.1 # via # cookiecutter # transifex-client -pytz==2022.1 +pytz==2022.5 # via # django # xblock @@ -150,7 +154,7 @@ pyyaml==6.0 # via # cookiecutter # xblock -requests==2.28.0 +requests==2.28.1 # via # -r requirements/base.in # cookiecutter @@ -173,18 +177,19 @@ six==1.16.0 # transifex-client smmap==5.0.0 # via gitdb -sqlparse==0.4.2 +sqlparse==0.4.3 # via django text-unidecode==1.3 # via python-slugify tomli==2.0.1 # via + # build # coverage # pep517 # pytest transifex-client==0.14.4 # via -r requirements/dev.in -urllib3==1.26.9 +urllib3==1.26.12 # via # botocore # requests diff --git a/requirements/travis.txt b/requirements/travis.txt index 403bfab..3f82a49 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -6,34 +6,34 @@ # asgiref==3.5.2 # via django -certifi==2022.6.15 +certifi==2022.9.24 # via requests -charset-normalizer==2.0.12 +charset-normalizer==2.1.1 # via requests -coverage==6.4.1 +coverage==6.5.0 # via coveralls coveralls==3.3.1 # via -r requirements/travis.in -distlib==0.3.4 +distlib==0.3.6 # via virtualenv -django==3.2.13 +django==3.2.16 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt # edx-i18n-tools docopt==0.6.2 # via coveralls -edx-i18n-tools==0.9.1 +edx-i18n-tools==0.9.2 # via -r requirements/travis.in -filelock==3.7.1 +filelock==3.8.0 # via # tox # virtualenv -idna==3.3 +idna==3.4 # via requests packaging==21.3 # via tox -path==16.4.0 +path==16.5.0 # via edx-i18n-tools platformdirs==2.5.2 # via virtualenv @@ -45,27 +45,25 @@ py==1.11.0 # via tox pyparsing==3.0.9 # via packaging -pytz==2022.1 +pytz==2022.5 # via django pyyaml==6.0 # via edx-i18n-tools -requests==2.28.0 +requests==2.28.1 # via coveralls six==1.16.0 - # via - # tox - # virtualenv -sqlparse==0.4.2 + # via tox +sqlparse==0.4.3 # via django -toml==0.10.2 +tomli==2.0.1 # via tox -tox==3.25.0 +tox==3.26.0 # via # -r requirements/travis.in # tox-battery tox-battery==0.6.1 # via -r requirements/travis.in -urllib3==1.26.9 +urllib3==1.26.12 # via requests -virtualenv==20.14.1 +virtualenv==20.16.5 # via tox