From 373f0dd82e68ab7cac7a77344e715dbe68faebd3 Mon Sep 17 00:00:00 2001 From: David Lord Date: Sun, 1 Nov 2020 05:30:02 -0800 Subject: [PATCH] update requirements (#3823) --- .pre-commit-config.yaml | 10 +++++----- requirements/dev.txt | 28 ++++++++++++++-------------- requirements/docs.txt | 10 +++++----- requirements/tests.txt | 8 ++++---- src/flask/blueprints.py | 6 ++---- src/flask/scaffold.py | 3 +-- tests/test_basic.py | 3 ++- 7 files changed, 33 insertions(+), 35 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c81cc3d3..5747d1b1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,29 +1,29 @@ repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.4.3 + rev: v2.7.3 hooks: - id: pyupgrade args: ["--py36-plus"] - repo: https://github.com/asottile/reorder_python_imports - rev: v2.3.0 + rev: v2.3.6 hooks: - id: reorder-python-imports name: Reorder Python imports (src, tests) files: "^(?!examples/)" args: ["--application-directories", "src"] - repo: https://github.com/python/black - rev: 19.10b0 + rev: 20.8b1 hooks: - id: black - repo: https://gitlab.com/pycqa/flake8 - rev: 3.8.2 + rev: 3.8.4 hooks: - id: flake8 additional_dependencies: - flake8-bugbear - flake8-implicit-str-concat - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.1.0 + rev: v3.3.0 hooks: - id: check-byte-order-marker - id: trailing-whitespace diff --git a/requirements/dev.txt b/requirements/dev.txt index daf08fd6..ccf396e7 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,37 +6,37 @@ # alabaster==0.7.12 # via sphinx appdirs==1.4.4 # via virtualenv -attrs==19.3.0 # via pytest +attrs==20.2.0 # via pytest babel==2.8.0 # via sphinx blinker==1.4 # via -r requirements/tests.in -certifi==2020.4.5.1 # via requests -cfgv==3.1.0 # via pre-commit +certifi==2020.6.20 # via requests +cfgv==3.2.0 # via pre-commit chardet==3.0.4 # via requests click==7.1.2 # via pip-tools -distlib==0.3.0 # via virtualenv +distlib==0.3.1 # via virtualenv docutils==0.16 # via sphinx filelock==3.0.12 # via tox, virtualenv greenlet==0.4.17 # via -r requirements/tests.in -identify==1.4.16 # via pre-commit -idna==2.9 # via requests +identify==1.5.6 # via pre-commit +idna==2.10 # via requests imagesize==1.2.0 # via sphinx -iniconfig==1.0.0 # via pytest +iniconfig==1.1.1 # via pytest jinja2==2.11.2 # via sphinx markupsafe==1.1.1 # via jinja2 -nodeenv==1.3.5 # via pre-commit +nodeenv==1.5.0 # via pre-commit packaging==20.4 # via -r requirements/docs.in, pallets-sphinx-themes, pytest, sphinx, tox pallets-sphinx-themes==1.2.3 # via -r requirements/docs.in pip-tools==5.3.1 # via -r requirements/dev.in pluggy==0.13.1 # via pytest, tox pre-commit==2.8.2 # via -r requirements/dev.in py==1.9.0 # via pytest, tox -pygments==2.6.1 # via sphinx, sphinx-tabs +pygments==2.7.2 # via sphinx, sphinx-tabs pyparsing==2.4.7 # via packaging pytest==6.1.2 # via -r requirements/tests.in -python-dotenv==0.14.0 # via -r requirements/tests.in +python-dotenv==0.15.0 # via -r requirements/tests.in pytz==2020.1 # via babel pyyaml==5.3.1 # via pre-commit -requests==2.23.0 # via sphinx +requests==2.24.0 # via sphinx six==1.15.0 # via packaging, pip-tools, tox, virtualenv snowballstemmer==2.0.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in @@ -49,10 +49,10 @@ sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-log-cabinet==1.0.1 # via -r requirements/docs.in sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.4 # via sphinx -toml==0.10.1 # via pre-commit, pytest, tox +toml==0.10.2 # via pre-commit, pytest, tox tox==3.20.1 # via -r requirements/dev.in -urllib3==1.25.9 # via requests -virtualenv==20.0.21 # via pre-commit, tox +urllib3==1.25.11 # via requests +virtualenv==20.1.0 # via pre-commit, tox # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/docs.txt b/requirements/docs.txt index 1733a0c1..045fb161 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -6,19 +6,19 @@ # alabaster==0.7.12 # via sphinx babel==2.8.0 # via sphinx -certifi==2020.4.5.1 # via requests +certifi==2020.6.20 # via requests chardet==3.0.4 # via requests docutils==0.16 # via sphinx -idna==2.9 # via requests +idna==2.10 # via requests imagesize==1.2.0 # via sphinx jinja2==2.11.2 # via sphinx markupsafe==1.1.1 # via jinja2 packaging==20.4 # via -r requirements/docs.in, pallets-sphinx-themes, sphinx pallets-sphinx-themes==1.2.3 # via -r requirements/docs.in -pygments==2.6.1 # via sphinx, sphinx-tabs +pygments==2.7.2 # via sphinx, sphinx-tabs pyparsing==2.4.7 # via packaging pytz==2020.1 # via babel -requests==2.23.0 # via sphinx +requests==2.24.0 # via sphinx six==1.15.0 # via packaging snowballstemmer==2.0.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in @@ -31,7 +31,7 @@ sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-log-cabinet==1.0.1 # via -r requirements/docs.in sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.4 # via sphinx -urllib3==1.25.9 # via requests +urllib3==1.25.11 # via requests # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/tests.txt b/requirements/tests.txt index 592a0e2a..790056bb 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -4,15 +4,15 @@ # # pip-compile requirements/tests.in # -attrs==19.3.0 # via pytest +attrs==20.2.0 # via pytest blinker==1.4 # via -r requirements/tests.in greenlet==0.4.17 # via -r requirements/tests.in -iniconfig==1.0.0 # via pytest +iniconfig==1.1.1 # via pytest packaging==20.4 # via pytest pluggy==0.13.1 # via pytest py==1.9.0 # via pytest pyparsing==2.4.7 # via packaging pytest==6.1.2 # via -r requirements/tests.in -python-dotenv==0.14.0 # via -r requirements/tests.in +python-dotenv==0.15.0 # via -r requirements/tests.in six==1.15.0 # via packaging -toml==0.10.1 # via pytest +toml==0.10.2 # via pytest diff --git a/src/flask/blueprints.py b/src/flask/blueprints.py index d374b43f..4842ace8 100644 --- a/src/flask/blueprints.py +++ b/src/flask/blueprints.py @@ -451,16 +451,14 @@ class Blueprint(Scaffold): return decorator def app_url_value_preprocessor(self, f): - """Same as :meth:`url_value_preprocessor` but application wide. - """ + """Same as :meth:`url_value_preprocessor` but application wide.""" self.record_once( lambda s: s.app.url_value_preprocessors.setdefault(None, []).append(f) ) return f def app_url_defaults(self, f): - """Same as :meth:`url_defaults` but application wide. - """ + """Same as :meth:`url_defaults` but application wide.""" self.record_once( lambda s: s.app.url_default_functions.setdefault(None, []).append(f) ) diff --git a/src/flask/scaffold.py b/src/flask/scaffold.py index f37b415d..5b6bb80c 100644 --- a/src/flask/scaffold.py +++ b/src/flask/scaffold.py @@ -32,8 +32,7 @@ def setupmethod(f): class Scaffold(_PackageBoundObject): - """A common base for class Flask and class Blueprint. - """ + """A common base for class Flask and class Blueprint.""" #: Skeleton local JSON decoder class to use. #: Set to ``None`` to use the app's :class:`~flask.app.Flask.json_encoder`. diff --git a/tests/test_basic.py b/tests/test_basic.py index 76d3e1fc..8cd77ccd 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -20,7 +20,8 @@ import flask require_cpython_gc = pytest.mark.skipif( - python_implementation() != "CPython", reason="Requires CPython GC behavior", + python_implementation() != "CPython", + reason="Requires CPython GC behavior", )