From 519f61eb9e9752a908f7d7ab5c6281a5d7814c61 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sat, 28 Sep 2024 20:26:00 -0400 Subject: [PATCH 1/2] chore: Upgrade Python requirements --- requirements/pip.txt | 2 +- requirements/quality.txt | 8 ++++---- requirements/tox.txt | 10 +++++----- requirements/travis.txt | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/requirements/pip.txt b/requirements/pip.txt index f313a9c..36c777e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ 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 +setuptools==75.1.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index b96f698..d6b0b02 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -12,11 +12,11 @@ asgiref==3.8.1 # via # -r requirements/base.txt # django -astroid==3.2.4 +astroid==3.3.4 # via pylint coverage==7.6.1 # via -r requirements/test.txt -dill==0.3.8 +dill==0.3.9 # via pylint django==4.2.16 # via @@ -53,7 +53,7 @@ packaging==24.1 # via # -r requirements/test.txt # pytest -platformdirs==4.3.3 +platformdirs==4.3.6 # via pylint pluggy==1.5.0 # via @@ -61,7 +61,7 @@ pluggy==1.5.0 # pytest pycodestyle==2.12.1 # via -r requirements/quality.in -pylint==3.2.7 +pylint==3.3.1 # via -r requirements/quality.in pytest==8.3.3 # via diff --git a/requirements/tox.txt b/requirements/tox.txt index 606ba12..2451026 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -12,7 +12,7 @@ colorama==0.4.6 # via tox distlib==0.3.8 # 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.3 +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.20.0 # via -r requirements/tox.in -virtualenv==20.26.4 +virtualenv==20.26.6 # via tox diff --git a/requirements/travis.txt b/requirements/travis.txt index ce7dab8..2892acc 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -30,19 +30,19 @@ distlib==0.3.8 # virtualenv docopt==0.6.2 # via coveralls -filelock==3.16.0 +filelock==3.16.1 # via # -r requirements/tox.txt # tox # virtualenv -idna==3.9 +idna==3.10 # via requests packaging==24.1 # via # -r requirements/tox.txt # pyproject-api # tox -platformdirs==4.3.3 +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.20.0 # via -r requirements/tox.txt urllib3==2.2.3 # via requests -virtualenv==20.26.4 +virtualenv==20.26.6 # via # -r requirements/tox.txt # tox From 1a6795482611b60544a27fc978d60177549da7ae Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 30 Sep 2024 10:05:40 +0500 Subject: [PATCH 2/2] fix: quality check issues --- invideoquiz/__init__.py | 1 + invideoquiz/invideoquiz.py | 3 +-- pylintrc | 7 +++--- requirements/pip_tools.txt | 2 +- requirements/quality.in | 3 +++ requirements/quality.txt | 47 ++++++++++++++++++++++++++++++++++++-- 6 files changed, 55 insertions(+), 8 deletions(-) diff --git a/invideoquiz/__init__.py b/invideoquiz/__init__.py index 038e650..fbcb228 100644 --- a/invideoquiz/__init__.py +++ b/invideoquiz/__init__.py @@ -1,3 +1,4 @@ +# pylint: disable=django-not-configured """ Runtime will load the XBlock class from here. """ diff --git a/invideoquiz/invideoquiz.py b/invideoquiz/invideoquiz.py index 32dbf37..85b4daf 100644 --- a/invideoquiz/invideoquiz.py +++ b/invideoquiz/invideoquiz.py @@ -40,7 +40,6 @@ def get_resource_string(path): class InVideoQuizXBlock(StudioEditableXBlockMixin, XBlock): - # pylint: disable=too-many-ancestors """ Display CAPA problems within a video component at a specified time. """ @@ -165,7 +164,7 @@ def get_resource_url(self, path): resource_url = self.runtime.local_resource_url(self, path) return resource_url - def build_fragment( + def build_fragment( # pylint: disable=too-many-positional-arguments self, path_html='', paths_css=None, diff --git a/pylintrc b/pylintrc index cadb490..e9f59d6 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.5 +# Generated by edx-lint version: 5.4.0 # ------------------------------ [MASTER] ignore = @@ -259,6 +259,7 @@ enable = useless-suppression, disable = bad-indentation, + broad-exception-raised, consider-using-f-string, duplicate-code, file-ignored, @@ -380,6 +381,6 @@ ext-import-graph = int-import-graph = [EXCEPTIONS] -overgeneral-exceptions = Exception +overgeneral-exceptions = builtins.Exception -# 54daa2b24c4b5341a45cdb4727fe15d05ef04c5f +# 821f7cf64aaeddd33ba92fc983426e975d2eac72 diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 77d81ad..764d7ec 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -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.in b/requirements/quality.in index c03dd12..0263d11 100644 --- a/requirements/quality.in +++ b/requirements/quality.in @@ -6,3 +6,6 @@ pycodestyle pylint +edx-lint +pylint-django +pylint-celery diff --git a/requirements/quality.txt b/requirements/quality.txt index d6b0b02..e6b8e28 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -13,7 +13,18 @@ asgiref==3.8.1 # -r requirements/base.txt # django astroid==3.3.4 - # via pylint + # via + # pylint + # pylint-celery +click==8.1.7 + # via + # click-log + # code-annotations + # edx-lint +click-log==0.4.0 + # via edx-lint +code-annotations==1.8.0 + # via edx-lint coverage==7.6.1 # via -r requirements/test.txt dill==0.3.9 @@ -22,6 +33,8 @@ django==4.2.16 # via # -c requirements/common_constraints.txt # -r requirements/base.txt +edx-lint==5.4.0 + # via -r requirements/quality.in fs==2.4.16 # via # -r requirements/base.txt @@ -32,6 +45,8 @@ iniconfig==2.0.0 # pytest isort==5.13.2 # via pylint +jinja2==3.1.4 + # via code-annotations lxml==5.3.0 # via # -r requirements/base.txt @@ -43,6 +58,7 @@ mako==1.3.5 markupsafe==2.1.5 # via # -r requirements/base.txt + # jinja2 # mako # xblock mccabe==0.7.0 @@ -53,6 +69,8 @@ packaging==24.1 # via # -r requirements/test.txt # pytest +pbr==6.1.0 + # via stevedore platformdirs==4.3.6 # via pylint pluggy==1.5.0 @@ -62,7 +80,24 @@ pluggy==1.5.0 pycodestyle==2.12.1 # via -r requirements/quality.in pylint==3.3.1 - # via -r requirements/quality.in + # via + # -r requirements/quality.in + # edx-lint + # pylint-celery + # pylint-django + # pylint-plugin-utils +pylint-celery==0.3 + # via + # -r requirements/quality.in + # edx-lint +pylint-django==2.5.5 + # via + # -r requirements/quality.in + # edx-lint +pylint-plugin-utils==0.8.2 + # via + # pylint-celery + # pylint-django pytest==8.3.3 # via # -r requirements/test.txt @@ -73,6 +108,8 @@ python-dateutil==2.9.0.post0 # via # -r requirements/base.txt # xblock +python-slugify==8.0.4 + # via code-annotations pytz==2024.2 # via # -r requirements/base.txt @@ -80,6 +117,7 @@ pytz==2024.2 pyyaml==6.0.2 # via # -r requirements/base.txt + # code-annotations # xblock simplejson==3.19.3 # via @@ -88,12 +126,17 @@ simplejson==3.19.3 six==1.16.0 # via # -r requirements/base.txt + # edx-lint # fs # python-dateutil sqlparse==0.5.1 # via # -r requirements/base.txt # django +stevedore==5.3.0 + # via code-annotations +text-unidecode==1.3 + # via python-slugify tomlkit==0.13.2 # via pylint web-fragments==2.2.0