From 7c70d26fe7344ccd92f8c849c2a41ddbe5e64d09 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 2 Oct 2021 23:13:24 +1000 Subject: [PATCH] update Python deps --- pip/requirements.txt | 110 +++++++++++++++++++--------------- pip/stubs/gatherstubs.py | 2 + pylib/.pylintrc | 3 + pylib/tests/run_pylint.py | 12 +++- qt/.pylintrc | 1 + qt/aqt/browser/table/state.py | 2 +- qt/aqt/qt.py | 2 +- qt/aqt/tts.py | 1 + 8 files changed, 81 insertions(+), 52 deletions(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index cb0711b58..f390f7cf2 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -1,6 +1,4 @@ -appdirs==1.4.4 - # via black -astroid==2.5.6 +astroid==2.8.0 # via pylint atomicwrites==1.4.0 ; sys_platform == "win32" # via @@ -10,13 +8,13 @@ attrs==21.2.0 # via # jsonschema # pytest -beautifulsoup4==4.9.3 +beautifulsoup4==4.10.0 # via -r requirements.in -black==21.6b0 +black==21.9b0 # via -r requirements.in certifi==2021.5.30 # via requests -chardet==4.0.0 +charset-normalizer==2.0.6 # via requests click==8.0.1 # via @@ -31,9 +29,9 @@ colorama==0.4.4 ; sys_platform == "win32" # pytest compare-locales==8.1.0 # via -r requirements.in -decorator==5.0.9 +decorator==5.1.0 # via -r requirements.in -distro==1.5.0 +distro==1.6.0 # via -r requirements.in flask-cors==3.0.10 # via -r requirements.in @@ -45,11 +43,11 @@ fluent.syntax==0.18.1 # via # -r requirements.in # compare-locales -idna==2.10 +idna==3.2 # via requests iniconfig==1.1.1 # via pytest -isort==5.8.0 +isort==5.9.3 # via # -r requirements.in # pylint @@ -57,7 +55,7 @@ itsdangerous==2.0.1 # via flask jinja2==3.0.1 # via flask -jsonschema==3.2.0 +jsonschema==4.0.1 # via -r requirements.in lazy-object-proxy==1.6.0 # via astroid @@ -73,23 +71,27 @@ mypy-extensions==0.4.3 # via # black # mypy -mypy-protobuf==2.4 +mypy-protobuf==2.10 # via -r requirements.in -mypy==0.902 +mypy==0.910 # via -r requirements.in -orjson==3.5.3 +orjson==3.6.4 # via -r requirements.in -packaging==20.9 +packaging==21.0 # via pytest -pathspec==0.8.1 +pathspec==0.9.0 # via black -pep517==0.10.0 +pep517==0.11.0 # via pip-tools -pip-tools==6.1.0 +pip-tools==6.3.0 # via -r requirements.in -pluggy==0.13.1 +platformdirs==2.4.0 + # via + # black + # pylint +pluggy==1.0.0 # via pytest -protobuf==3.17.3 +protobuf==3.18.0 # via # -r requirements.in # mypy-protobuf @@ -97,32 +99,30 @@ psutil==5.8.0 ; sys_platform == "win32" # via -r requirements.in py==1.10.0 # via pytest -pylint==2.8.3 +pylint==2.11.1 # via -r requirements.in pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 +pyrsistent==0.18.0 # via jsonschema pysocks==1.7.1 # via requests -pytest==6.2.4 +pytest==6.2.5 # via -r requirements.in pytoml==0.1.21 # via compare-locales pywin32==301 ; sys_platform == "win32" # via -r requirements.in -regex==2021.4.4 +regex==2021.9.30 # via black -requests[socks]==2.25.1 +requests[socks]==2.26.0 # via -r requirements.in -send2trash==1.5.0 +send2trash==1.8.0 # via -r requirements.in six==1.16.0 # via # compare-locales # flask-cors - # jsonschema - # protobuf snakeviz==2.1.0 # via -r requirements.in soupsieve==2.2.1 @@ -131,52 +131,64 @@ stringcase==1.2.0 # via -r requirements.in toml==0.10.2 # via - # black # mypy - # pep517 # pylint # pytest +tomli==1.2.1 + # via + # black + # pep517 tornado==6.1 # via snakeviz -types-click==7.1.1 +types-click==7.1.5 # via types-flask -types-decorator==0.1.4 +types-decorator==0.1.7 # via -r requirements.in -types-flask==1.1.0 +types-flask==1.1.3 # via -r requirements.in -types-futures==0.1.3 +types-futures==3.3.0 # via types-protobuf -types-jinja2==2.11.1 +types-jinja2==2.11.6 # via types-flask -types-markdown==0.1.4 +types-markdown==3.3.3 # via -r requirements.in -types-markupsafe==1.1.2 +types-markupsafe==1.1.6 # via types-jinja2 -types-orjson==0.1.0 +types-orjson==3.6.0 # via -r requirements.in -types-protobuf==0.1.12 +types-protobuf==3.17.4 + # via + # -r requirements.in + # mypy-protobuf +types-requests==2.25.9 # via -r requirements.in -types-requests==0.1.11 +types-waitress==0.1.9 # via -r requirements.in -types-waitress==0.1.6 - # via -r requirements.in -types-werkzeug==1.0.1 +types-werkzeug==1.0.5 # via types-flask -typing-extensions==3.10.0.0 - # via mypy -urllib3==1.26.5 +typing-extensions==3.10.0.2 + # via + # astroid + # black + # mypy + # pylint +urllib3==1.26.7 # via requests waitress==2.0.0 # via -r requirements.in werkzeug==2.0.1 # via flask +wheel==0.37.0 + # via pip-tools winrt==1.0.21033.1 ; sys_platform == "win32" and platform_release == "10" # via -r requirements.in wrapt==1.12.1 # via astroid # The following packages are considered to be unsafe in a requirements file: -pip==21.1.2 +pip==21.2.4 # via pip-tools -setuptools==57.0.0 - # via jsonschema +setuptools==58.2.0 + # via + # astroid + # pip-tools diff --git a/pip/stubs/gatherstubs.py b/pip/stubs/gatherstubs.py index 843e9cdf2..ba0d45f7e 100644 --- a/pip/stubs/gatherstubs.py +++ b/pip/stubs/gatherstubs.py @@ -26,5 +26,7 @@ if __name__ == "__main__": folder = os.path.join(os.path.dirname(__file__), "../../external") os.chdir(folder) for folder in os.listdir("."): + if "futures" in folder: + continue if match := name_re.search(folder): copy_folder(match.group(1), folder, outbase) diff --git a/pylib/.pylintrc b/pylib/.pylintrc index 094f99b89..eb69736d0 100644 --- a/pylib/.pylintrc +++ b/pylib/.pylintrc @@ -1,6 +1,7 @@ [MASTER] ignore-patterns=.*_pb2.* persistent = no +extension-pkg-whitelist=orjson [TYPECHECK] ignored-classes= @@ -47,6 +48,8 @@ disable= global-statement, protected-access, arguments-differ, + arguments-renamed, + consider-using-f-string, [BASIC] good-names = diff --git a/pylib/tests/run_pylint.py b/pylib/tests/run_pylint.py index 38cff00f8..828a9d02e 100644 --- a/pylib/tests/run_pylint.py +++ b/pylib/tests/run_pylint.py @@ -14,7 +14,17 @@ if __name__ == "__main__": sys.exit( subprocess.run( - [sys.executable, "-m", "pylint", module, "-j", "0", "--rcfile", ini], + [ + sys.executable, + "-m", + "pylint", + module, + "-j", + "0", + "--rcfile", + ini, + "--persistent=no", + ], check=False, ).returncode ) diff --git a/qt/.pylintrc b/qt/.pylintrc index ea7a8d48d..3cbdc97e9 100644 --- a/qt/.pylintrc +++ b/qt/.pylintrc @@ -34,3 +34,4 @@ disable=C,R, global-statement, protected-access, arguments-differ, + arguments-renamed, diff --git a/qt/aqt/browser/table/state.py b/qt/aqt/browser/table/state.py index a75acaa5e..fc11699d8 100644 --- a/qt/aqt/browser/table/state.py +++ b/qt/aqt/browser/table/state.py @@ -56,7 +56,7 @@ class ItemState(ABC): # abstractproperty is deprecated but used due to mypy limitations # (https://github.com/python/mypy/issues/1362) - @abstractproperty + @abstractproperty # pylint: disable=deprecated-decorator def active_columns(self) -> List[str]: """Return the saved or default columns for the state.""" diff --git a/qt/aqt/qt.py b/qt/aqt/qt.py index 3d9f1496c..f8b2f1ce7 100644 --- a/qt/aqt/qt.py +++ b/qt/aqt/qt.py @@ -34,7 +34,7 @@ def debug() -> None: from pdb import set_trace pyqtRemoveInputHook() - set_trace() + set_trace() # pylint: disable=forgotten-debug-statement if os.environ.get("DEBUG"): diff --git a/qt/aqt/tts.py b/qt/aqt/tts.py index f0973e7be..fb8e52035 100644 --- a/qt/aqt/tts.py +++ b/qt/aqt/tts.py @@ -158,6 +158,7 @@ class MacVoice(TTSVoice): original_name: str +# pylint: disable=no-member class MacTTSPlayer(TTSProcessPlayer): "Invokes a process to play the audio in the background."