diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1246eb00..b05084a6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 3.9.0 + rev: 3.9.1 hooks: - id: flake8 additional_dependencies: @@ -25,6 +25,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v3.4.0 hooks: - - id: check-byte-order-marker + - id: fix-byte-order-marker - id: trailing-whitespace - id: end-of-file-fixer diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 2a5f524c..0aca7ffd 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -905,7 +905,7 @@ Hooking in WSGI Middleware To add WSGI middleware to your Flask application, wrap the application's ``wsgi_app`` attribute. For example, to apply Werkzeug's -:class:`~werkzeug.middlware.proxy_fix.ProxyFix` middleware for running +:class:`~werkzeug.middleware.proxy_fix.ProxyFix` middleware for running behind Nginx: .. code-block:: python diff --git a/requirements/dev.txt b/requirements/dev.txt index 99014e94..934e7f31 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,6 +8,8 @@ alabaster==0.7.12 # via sphinx appdirs==1.4.4 # via virtualenv +asgiref==3.3.4 + # via -r requirements/tests.in attrs==20.3.0 # via pytest babel==2.9.0 @@ -32,7 +34,7 @@ filelock==3.0.12 # virtualenv greenlet==1.0.0 # via -r requirements/tests.in -identify==1.5.13 +identify==2.2.3 # via pre-commit idna==2.10 # via requests @@ -44,38 +46,39 @@ jinja2==2.11.3 # via sphinx markupsafe==1.1.1 # via jinja2 -nodeenv==1.5.0 +nodeenv==1.6.0 # via pre-commit packaging==20.9 # via - # -r requirements/docs.in # pallets-sphinx-themes # pytest # sphinx # tox -pallets-sphinx-themes==1.2.3 +pallets-sphinx-themes==2.0.0rc1 # via -r requirements/docs.in -pip-tools==5.5.0 +pep517==0.10.0 + # via pip-tools +pip-tools==6.1.0 # via -r requirements/dev.in pluggy==0.13.1 # via # pytest # tox -pre-commit==2.10.1 +pre-commit==2.12.0 # via -r requirements/dev.in py==1.10.0 # via # pytest # tox -pygments==2.7.4 +pygments==2.8.1 # via # sphinx # sphinx-tabs pyparsing==2.4.7 # via packaging -pytest==6.2.2 +pytest==6.2.3 # via -r requirements/tests.in -python-dotenv==0.15.0 +python-dotenv==0.17.0 # via -r requirements/tests.in pytz==2021.1 # via babel @@ -91,9 +94,9 @@ snowballstemmer==2.1.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in -sphinx-tabs==2.0.1 +sphinx-tabs==2.1.0 # via -r requirements/docs.in -sphinx==3.5.1 +sphinx==3.5.4 # via # -r requirements/docs.in # pallets-sphinx-themes @@ -116,14 +119,15 @@ sphinxcontrib-serializinghtml==1.1.4 # via sphinx toml==0.10.2 # via + # pep517 # pre-commit # pytest # tox -tox==3.22.0 +tox==3.23.0 # via -r requirements/dev.in urllib3==1.26.4 # via requests -virtualenv==20.4.2 +virtualenv==20.4.3 # via # pre-commit # tox diff --git a/requirements/docs.in b/requirements/docs.in index 47aca27a..c1898bc7 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,5 +1,4 @@ -Pallets-Sphinx-Themes -packaging +Pallets-Sphinx-Themes >= 2.0.0rc1 Sphinx sphinx-issues sphinxcontrib-log-cabinet diff --git a/requirements/docs.txt b/requirements/docs.txt index 08d3bcb0..55682252 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -24,12 +24,11 @@ markupsafe==1.1.1 # via jinja2 packaging==20.9 # via - # -r requirements/docs.in # pallets-sphinx-themes # sphinx -pallets-sphinx-themes==1.2.3 +pallets-sphinx-themes==2.0.0rc1 # via -r requirements/docs.in -pygments==2.7.4 +pygments==2.8.1 # via # sphinx # sphinx-tabs @@ -43,9 +42,9 @@ snowballstemmer==2.1.0 # via sphinx sphinx-issues==1.2.0 # via -r requirements/docs.in -sphinx-tabs==2.0.1 +sphinx-tabs==2.1.0 # via -r requirements/docs.in -sphinx==3.5.1 +sphinx==3.5.4 # via # -r requirements/docs.in # pallets-sphinx-themes diff --git a/requirements/tests.txt b/requirements/tests.txt index a44b876f..04ee36ba 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -4,7 +4,7 @@ # # pip-compile requirements/tests.in # -asgiref==3.2.10 +asgiref==3.3.4 # via -r requirements/tests.in attrs==20.3.0 # via pytest @@ -22,9 +22,9 @@ py==1.10.0 # via pytest pyparsing==2.4.7 # via packaging -pytest==6.2.2 +pytest==6.2.3 # via -r requirements/tests.in -python-dotenv==0.15.0 +python-dotenv==0.17.0 # via -r requirements/tests.in toml==0.10.2 # via pytest diff --git a/setup.py b/setup.py index 88889f4c..a72c19ef 100644 --- a/setup.py +++ b/setup.py @@ -4,10 +4,10 @@ from setuptools import setup setup( name="Flask", install_requires=[ - "Werkzeug>=0.15", - "Jinja2>=2.10.1", - "itsdangerous>=0.24", - "click>=5.1", + "Werkzeug>=2.0.0rc4", + "Jinja2>=3.0.0rc1", + "itsdangerous>=2.0.0rc2", + "click>=8.0.0rc1", ], extras_require={ "async": ["asgiref>=3.2"], diff --git a/src/flask/__init__.py b/src/flask/__init__.py index 1f503544..c15821ba 100644 --- a/src/flask/__init__.py +++ b/src/flask/__init__.py @@ -43,4 +43,4 @@ from .signals import template_rendered from .templating import render_template from .templating import render_template_string -__version__ = "2.0.0.dev" +__version__ = "2.0.0rc1"