diff --git a/imagemodal/mixins/fragment.py b/imagemodal/mixins/fragment.py index 8418fe6..b27b362 100644 --- a/imagemodal/mixins/fragment.py +++ b/imagemodal/mixins/fragment.py @@ -10,7 +10,7 @@ try: from web_fragments.fragment import Fragment -except Exception: # pylint: disable=broad-except +except Exception: from xblock.fragment import Fragment # For backward compatibility with quince and earlier. @@ -56,14 +56,9 @@ def student_view(self, context=None): ) return fragment - def build_fragment( - self, - template='', - context=None, - css=None, - js=None, - js_init=None, - ): + def build_fragment(self, template='', + context=None, css=None, + js=None, js_init=None): # pylint: disable=R0917 """ Creates a fragment for display. """ diff --git a/pylintrc b/pylintrc index 6830c86..59a1c58 100644 --- a/pylintrc +++ b/pylintrc @@ -67,15 +67,15 @@ # Generated by edx-lint version: 5.2.5 # ------------------------------ [MASTER] -ignore = +ignore = persistent = yes load-plugins = edx_lint.pylint,pylint_django,pylint_celery [MESSAGES CONTROL] -enable = +enable = blacklisted-name, line-too-long, - + abstract-class-instantiated, abstract-method, access-member-before-definition, @@ -184,26 +184,26 @@ enable = 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, @@ -234,30 +234,30 @@ enable = 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 = +disable = bad-indentation, consider-using-f-string, duplicate-code, @@ -281,10 +281,10 @@ disable = unspecified-encoding, unused-wildcard-import, use-maxsplit-arg, - + feature-toggle-needs-doc, illegal-waffle-usage, - + logging-fstring-interpolation, django-not-configured, @@ -329,7 +329,7 @@ ignore-imports = no ignore-mixin-members = yes ignored-classes = SQLObject unsafe-load-any-extension = yes -generated-members = +generated-members = REQUEST, acl_users, aq_parent, @@ -355,7 +355,7 @@ generated-members = [VARIABLES] init-import = no dummy-variables-rgx = _|dummy|unused|.*_unused -additional-builtins = +additional-builtins = [CLASSES] defining-attr-methods = __init__,__new__,setUp @@ -363,7 +363,7 @@ valid-classmethod-first-arg = cls valid-metaclass-classmethod-first-arg = mcs [DESIGN] -max-args = 5 +max-args = 6 ignored-argument-names = _.* max-locals = 15 max-returns = 6 @@ -376,9 +376,9 @@ max-public-methods = 20 [IMPORTS] deprecated-modules = regsub,TERMIOS,Bastion,rexec -import-graph = -ext-import-graph = -int-import-graph = +import-graph = +ext-import-graph = +int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception diff --git a/requirements/base.txt b/requirements/base.txt index 317ce2f..a586a2a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -16,15 +16,15 @@ fs==2.4.16 # via xblock lxml==5.3.0 # via xblock -mako==1.3.5 +mako==1.3.6 # via xblock -markupsafe==2.1.5 +markupsafe==3.0.2 # via # mako # xblock python-dateutil==2.9.0.post0 # via xblock -pytz==2024.1 +pytz==2024.2 # via xblock pyyaml==6.0.2 # via xblock @@ -39,7 +39,7 @@ sqlparse==0.5.1 # via django web-fragments==2.2.0 # via xblock -webob==1.8.8 +webob==1.8.9 # via xblock xblock==5.1.0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 41238bd..2701079 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -14,35 +14,35 @@ chardet==5.2.0 # via # -r requirements/tox.txt # tox -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests colorama==0.4.6 # via # -r requirements/tox.txt # tox -coverage[toml]==7.6.1 +coverage[toml]==7.6.4 # via coveralls coveralls==4.0.1 # via -r requirements/ci.in -distlib==0.3.8 +distlib==0.3.9 # via # -r requirements/tox.txt # virtualenv docopt==0.6.2 # via coveralls -filelock==3.16.0 +filelock==3.16.1 # via # -r requirements/tox.txt # tox # virtualenv -idna==3.8 +idna==3.10 # via requests packaging==24.1 # via # -r requirements/tox.txt # pyproject-api # tox -platformdirs==4.3.2 +platformdirs==4.3.6 # via # -r requirements/tox.txt # tox @@ -51,17 +51,17 @@ pluggy==1.5.0 # via # -r requirements/tox.txt # tox -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via # -r requirements/tox.txt # tox requests==2.32.3 # via coveralls -tox==4.18.1 +tox==4.23.2 # via -r requirements/tox.txt -urllib3==2.2.2 +urllib3==2.2.3 # via requests -virtualenv==20.26.4 +virtualenv==20.27.1 # via # -r requirements/tox.txt # tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 31879f7..cadbfbd 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -29,3 +29,7 @@ django-simple-history==3.0.0 # This can be unpinned once https://github.com/openedx/edx-platform/issues/34586 # has been resolved and edx-platform is running with pymongo>=4.4.0 event-tracking<2.4.1 + +# Cause: https://github.com/openedx/edx-lint/issues/458 +# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved. +pip<24.3 diff --git a/requirements/pip.txt b/requirements/pip.txt index f313a9c..4996fad 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -9,6 +9,8 @@ wheel==0.44.0 # The following packages are considered to be unsafe in a requirements file: pip==24.2 - # via -r requirements/pip.in -setuptools==74.1.2 + # via + # -c requirements/common_constraints.txt + # -r requirements/pip.in +setuptools==75.3.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 77d81ad..81e6fbc 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.2.2 +build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools @@ -12,7 +12,7 @@ packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip_tools.in -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # build # pip-tools diff --git a/requirements/quality.txt b/requirements/quality.txt index 4836952..57005a9 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -12,7 +12,7 @@ asgiref==3.8.1 # via # -r requirements/base.txt # django -astroid==3.2.4 +astroid==3.3.5 # via # -r requirements/test.txt # pylint @@ -31,9 +31,9 @@ code-annotations==1.8.0 # via # -r requirements/test.txt # edx-lint -coverage==7.6.1 +coverage==7.6.4 # via -r requirements/test.txt -dill==0.3.8 +dill==0.3.9 # via # -r requirements/test.txt # pylint @@ -41,11 +41,11 @@ django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/base.txt -dnspython==2.6.1 +dnspython==2.7.0 # via # -r requirements/test.txt # pymongo -edx-lint==5.4.0 +edx-lint==5.4.1 # via -r requirements/test.txt edx-opaque-keys==2.11.0 # via -r requirements/test.txt @@ -65,11 +65,11 @@ lxml==5.3.0 # via # -r requirements/base.txt # xblock -mako==1.3.5 +mako==1.3.6 # via # -r requirements/base.txt # xblock -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -r requirements/base.txt # -r requirements/test.txt @@ -86,13 +86,13 @@ pbr==6.1.0 # via # -r requirements/test.txt # stevedore -platformdirs==4.3.2 +platformdirs==4.3.6 # via # -r requirements/test.txt # pylint pycodestyle==2.12.1 # via -r requirements/quality.in -pylint==3.2.7 +pylint==3.3.1 # via # -r requirements/quality.in # -r requirements/test.txt @@ -104,7 +104,7 @@ pylint-celery==0.3 # via # -r requirements/test.txt # edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via # -r requirements/test.txt # edx-lint @@ -113,7 +113,7 @@ pylint-plugin-utils==0.8.2 # -r requirements/test.txt # pylint-celery # pylint-django -pymongo==4.8.0 +pymongo==4.10.1 # via # -r requirements/test.txt # edx-opaque-keys @@ -125,7 +125,7 @@ python-slugify==8.0.4 # via # -r requirements/test.txt # code-annotations -pytz==2024.1 +pytz==2024.2 # via # -r requirements/base.txt # xblock @@ -171,7 +171,7 @@ web-fragments==2.2.0 # via # -r requirements/base.txt # xblock -webob==1.8.8 +webob==1.8.9 # via # -r requirements/base.txt # xblock diff --git a/requirements/test.txt b/requirements/test.txt index 6a84219..c5d1fff 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -astroid==3.2.4 +astroid==3.3.5 # via # pylint # pylint-celery @@ -17,13 +17,13 @@ click-log==0.4.0 # via edx-lint code-annotations==1.8.0 # via edx-lint -coverage==7.6.1 +coverage==7.6.4 # via -r requirements/test.in -dill==0.3.8 +dill==0.3.9 # via pylint -dnspython==2.6.1 +dnspython==2.7.0 # via pymongo -edx-lint==5.4.0 +edx-lint==5.4.1 # via -r requirements/test.in edx-opaque-keys==2.11.0 # via -r requirements/test.in @@ -31,7 +31,7 @@ isort==5.13.2 # via pylint jinja2==3.1.4 # via code-annotations -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 mccabe==0.7.0 # via pylint @@ -39,9 +39,9 @@ mock==5.1.0 # via -r requirements/test.in pbr==6.1.0 # via stevedore -platformdirs==4.3.2 +platformdirs==4.3.6 # via pylint -pylint==3.2.7 +pylint==3.3.1 # via # edx-lint # pylint-celery @@ -49,13 +49,13 @@ pylint==3.2.7 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.5 +pylint-django==2.6.1 # via edx-lint pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pymongo==4.8.0 +pymongo==4.10.1 # via edx-opaque-keys python-slugify==8.0.4 # via code-annotations diff --git a/requirements/tox.txt b/requirements/tox.txt index c6769e2..5987dbb 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -10,9 +10,9 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -filelock==3.16.0 +filelock==3.16.1 # via # tox # virtualenv @@ -20,15 +20,15 @@ packaging==24.1 # via # pyproject-api # tox -platformdirs==4.3.2 +platformdirs==4.3.6 # via # tox # virtualenv pluggy==1.5.0 # via tox -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via tox -tox==4.18.1 +tox==4.23.2 # via -r requirements/tox.in -virtualenv==20.26.4 +virtualenv==20.27.1 # via tox