diff --git a/pylintrc b/pylintrc index 8a8af1b..fddcfdb 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.5 +# Generated by edx-lint version: 5.3.6 # ------------------------------ [MASTER] ignore = migrations @@ -259,6 +259,7 @@ enable = useless-suppression, disable = bad-indentation, + broad-exception-raised, consider-using-f-string, duplicate-code, file-ignored, @@ -286,7 +287,6 @@ disable = illegal-waffle-usage, logging-fstring-interpolation, - no-self-use, django-not-available, [REPORTS] @@ -382,6 +382,6 @@ ext-import-graph = int-import-graph = [EXCEPTIONS] -overgeneral-exceptions = Exception +overgeneral-exceptions = builtins.Exception -# 0fc0d3e6714dbf532960c58d542877f3741cfdc8 +# f90fb567b1f44429c280e9de9c5d874fb1d81d25 diff --git a/pylintrc_tweaks b/pylintrc_tweaks index dfd47a7..9282ab3 100644 --- a/pylintrc_tweaks +++ b/pylintrc_tweaks @@ -5,5 +5,4 @@ load-plugins = edx_lint.pylint,pylint_django,pylint_celery [MESSAGES CONTROL] disable+ = - no-self-use, django-not-available, diff --git a/requirements/base.txt b/requirements/base.txt index 677cc0e..e42ef85 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,22 +1,22 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -lxml==4.9.1 +lxml==5.1.0 # via -r requirements/base.in -markupsafe==2.1.1 +markupsafe==2.1.5 # via -r requirements/base.in -mpmath==1.2.1 +mpmath==1.3.0 # via sympy -numpy==1.23.1 +numpy==1.24.4 # via # -r requirements/base.in # scipy -pyparsing==3.0.9 +pyparsing==3.1.2 # via -r requirements/base.in -scipy==1.8.1 +scipy==1.10.1 # via -r requirements/base.in -sympy==1.10.1 +sympy==1.12 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 555ff58..c45838a 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,66 +1,72 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -certifi==2022.6.15 +cachetools==5.3.3 + # via + # -r requirements/tox.txt + # tox +certifi==2024.2.2 # via requests -charset-normalizer==2.1.0 +chardet==5.2.0 + # via + # -r requirements/tox.txt + # tox +charset-normalizer==3.3.2 # via requests -coverage==6.4.2 +colorama==0.4.6 + # via + # -r requirements/tox.txt + # tox +coverage==6.5.0 # via coveralls coveralls==3.3.1 # via -r requirements/ci.in -distlib==0.3.5 +distlib==0.3.8 # via # -r requirements/tox.txt # virtualenv docopt==0.6.2 # via coveralls -filelock==3.7.1 +filelock==3.13.1 # via # -r requirements/tox.txt # tox # virtualenv -idna==3.3 +idna==3.6 # via requests -packaging==21.3 +packaging==24.0 # via # -r requirements/tox.txt + # pyproject-api # tox -platformdirs==2.5.2 +platformdirs==4.2.0 # via # -r requirements/tox.txt + # tox # virtualenv -pluggy==1.0.0 +pluggy==1.4.0 # via # -r requirements/tox.txt # tox -py==1.11.0 +pyproject-api==1.6.1 # via # -r requirements/tox.txt # tox -pyparsing==3.0.9 - # via - # -r requirements/tox.txt - # packaging -requests==2.28.1 +requests==2.31.0 # via coveralls -six==1.16.0 - # via - # -r requirements/tox.txt - # tox - # virtualenv -toml==0.10.2 +tomli==2.0.1 # via # -r requirements/tox.txt + # pyproject-api # tox -tox==3.25.1 +tox==4.14.1 # via -r requirements/tox.txt -urllib3==1.26.10 +urllib3==2.2.1 # via requests -virtualenv==20.15.1 +virtualenv==20.25.1 # via # -r requirements/tox.txt # tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index cca3ccd..e3bf8ea 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -13,13 +13,20 @@ # using LTS django version -Django<4.0 +Django<5.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 + +# opentelemetry requires version 6.x at the moment: +# https://github.com/open-telemetry/opentelemetry-python/issues/3570 +# Normally this could be added as a constraint in edx-django-utils, where we're +# adding the opentelemetry dependency. However, when we compile pip-tools.txt, +# that uses version 7.x, and then there's no undoing that when compiling base.txt. +# So we need to pin it globally, for now. +# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407 +importlib-metadata<7 diff --git a/requirements/pip.txt b/requirements/pip.txt index 0495eb8..cf44902 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,16 +1,14 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -wheel==0.37.1 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.2 +pip==24.0 + # via -r requirements/pip.in +setuptools==69.2.0 # via -r requirements/pip.in -setuptools==59.8.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 32b8de6..152da44 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,27 +1,34 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -build==0.8.0 +build==1.1.1 # via pip-tools -click==8.1.3 +click==8.1.7 # via pip-tools -packaging==21.3 - # via build -pep517==0.12.0 +importlib-metadata==6.11.0 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # build +packaging==24.0 # via build -pip-tools==6.8.0 +pip-tools==7.4.1 # via -r requirements/pip_tools.in -pyparsing==3.0.9 - # via packaging +pyproject-hooks==1.0.0 + # via + # build + # pip-tools tomli==2.0.1 # via # build - # pep517 -wheel==0.37.1 + # pip-tools + # pyproject-hooks +wheel==0.43.0 # via pip-tools +zipp==3.18.1 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/test.txt b/requirements/test.txt index 95b7406..f9dda99 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,71 +1,76 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -astroid==2.11.7 +astroid==3.1.0 # via # pylint # pylint-celery -click==8.1.3 +cachetools==5.3.3 + # via tox +chardet==5.2.0 + # via tox +click==8.1.7 # via # click-log # code-annotations # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.3.0 +code-annotations==1.7.0 # via edx-lint -coverage==6.4.2 +colorama==0.4.6 + # via tox +coverage==7.4.4 # via -r requirements/test.in -dill==0.3.5.1 +dill==0.3.8 # via pylint -distlib==0.3.5 +distlib==0.3.8 # via virtualenv -edx-lint==5.2.4 +edx-lint==5.3.6 # via -r requirements/test.in -filelock==3.7.1 +filelock==3.13.1 # via # tox # virtualenv -isort==5.10.1 +isort==5.13.2 # via pylint -jinja2==3.1.2 +jinja2==3.1.3 # via code-annotations -lazy-object-proxy==1.7.1 - # via astroid -lxml==4.9.1 +lxml==5.1.0 # via -r requirements/base.txt -markupsafe==2.1.1 +markupsafe==2.1.5 # via # -r requirements/base.txt # jinja2 mccabe==0.7.0 # via pylint -mpmath==1.2.1 +mpmath==1.3.0 # via # -r requirements/base.txt # sympy -numpy==1.23.1 +numpy==1.24.4 # via # -r requirements/base.txt # scipy -packaging==21.3 - # via tox -pbr==5.9.0 +packaging==24.0 + # via + # pyproject-api + # tox +pbr==6.0.0 # via stevedore -platformdirs==2.5.2 +platformdirs==4.2.0 # via # pylint + # tox # virtualenv -pluggy==1.0.0 - # via tox -py==1.11.0 +pluggy==1.4.0 # via tox -pycodestyle==2.8.0 +pycodestyle==2.11.1 # via -r requirements/test.in -pylint==2.14.5 +pylint==3.1.0 # via # -r requirements/test.in # edx-lint @@ -74,49 +79,42 @@ pylint==2.14.5 # 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.7 +pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pyparsing==3.0.9 - # via - # -r requirements/base.txt - # packaging -python-slugify==6.1.2 +pyparsing==3.1.2 + # via -r requirements/base.txt +pyproject-api==1.6.1 + # via tox +python-slugify==8.0.4 # via code-annotations -pyyaml==6.0 +pyyaml==6.0.1 # via code-annotations -scipy==1.8.1 +scipy==1.10.1 # via -r requirements/base.txt six==1.16.0 - # via - # edx-lint - # tox - # virtualenv -stevedore==4.0.0 + # via edx-lint +stevedore==5.2.0 # via code-annotations -sympy==1.10.1 +sympy==1.12 # via -r requirements/base.txt text-unidecode==1.3 # via python-slugify -toml==0.10.2 - # via tox tomli==2.0.1 + # via + # pylint + # pyproject-api + # tox +tomlkit==0.12.4 # via pylint -tomlkit==0.11.1 - # via pylint -tox==3.25.1 +tox==4.14.1 # via -r requirements/test.in -typing-extensions==4.3.0 +typing-extensions==4.10.0 # via # astroid # pylint -virtualenv==20.15.1 +virtualenv==20.25.1 # via tox -wrapt==1.14.1 - # via astroid - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/tox.txt b/requirements/tox.txt index 66512a3..daf54ce 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,32 +1,38 @@ # -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: # # make upgrade # -distlib==0.3.5 +cachetools==5.3.3 + # via tox +chardet==5.2.0 + # via tox +colorama==0.4.6 + # via tox +distlib==0.3.8 # via virtualenv -filelock==3.7.1 +filelock==3.13.1 # via # tox # virtualenv -packaging==21.3 - # via tox -platformdirs==2.5.2 - # via virtualenv -pluggy==1.0.0 - # via tox -py==1.11.0 - # via tox -pyparsing==3.0.9 - # via packaging -six==1.16.0 +packaging==24.0 + # via + # pyproject-api + # tox +platformdirs==4.2.0 # via # tox # virtualenv -toml==0.10.2 +pluggy==1.4.0 # via tox -tox==3.25.1 +pyproject-api==1.6.1 + # via tox +tomli==2.0.1 + # via + # pyproject-api + # tox +tox==4.14.1 # via -r requirements/tox.in -virtualenv==20.15.1 +virtualenv==20.25.1 # via tox diff --git a/symmath/symmath_check.py b/symmath/symmath_check.py index bfb1fa4..343c9a8 100644 --- a/symmath/symmath_check.py +++ b/symmath/symmath_check.py @@ -324,7 +324,7 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None #fsym = fsym.simplify() #fexpect = fexpect.simplify() try: - diff = (fexpect - fsym) + diff = fexpect - fsym except Exception as err: # lint-amnesty, pylint: disable=broad-except diff = None