Merge pull request #3965 from pallets/release-2.0.0rc1

Release 2.0.0rc1
This commit is contained in:
David Lord 2021-04-16 08:52:35 -07:00 committed by GitHub
commit 34eb0dad15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 31 deletions

View file

@ -16,7 +16,7 @@ repos:
hooks: hooks:
- id: black - id: black
- repo: https://github.com/PyCQA/flake8 - repo: https://github.com/PyCQA/flake8
rev: 3.9.0 rev: 3.9.1
hooks: hooks:
- id: flake8 - id: flake8
additional_dependencies: additional_dependencies:
@ -25,6 +25,6 @@ repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0 rev: v3.4.0
hooks: hooks:
- id: check-byte-order-marker - id: fix-byte-order-marker
- id: trailing-whitespace - id: trailing-whitespace
- id: end-of-file-fixer - id: end-of-file-fixer

View file

@ -905,7 +905,7 @@ Hooking in WSGI Middleware
To add WSGI middleware to your Flask application, wrap the application's To add WSGI middleware to your Flask application, wrap the application's
``wsgi_app`` attribute. For example, to apply Werkzeug'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: behind Nginx:
.. code-block:: python .. code-block:: python

View file

@ -8,6 +8,8 @@ alabaster==0.7.12
# via sphinx # via sphinx
appdirs==1.4.4 appdirs==1.4.4
# via virtualenv # via virtualenv
asgiref==3.3.4
# via -r requirements/tests.in
attrs==20.3.0 attrs==20.3.0
# via pytest # via pytest
babel==2.9.0 babel==2.9.0
@ -32,7 +34,7 @@ filelock==3.0.12
# virtualenv # virtualenv
greenlet==1.0.0 greenlet==1.0.0
# via -r requirements/tests.in # via -r requirements/tests.in
identify==1.5.13 identify==2.2.3
# via pre-commit # via pre-commit
idna==2.10 idna==2.10
# via requests # via requests
@ -44,38 +46,39 @@ jinja2==2.11.3
# via sphinx # via sphinx
markupsafe==1.1.1 markupsafe==1.1.1
# via jinja2 # via jinja2
nodeenv==1.5.0 nodeenv==1.6.0
# via pre-commit # via pre-commit
packaging==20.9 packaging==20.9
# via # via
# -r requirements/docs.in
# pallets-sphinx-themes # pallets-sphinx-themes
# pytest # pytest
# sphinx # sphinx
# tox # tox
pallets-sphinx-themes==1.2.3 pallets-sphinx-themes==2.0.0rc1
# via -r requirements/docs.in # 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 # via -r requirements/dev.in
pluggy==0.13.1 pluggy==0.13.1
# via # via
# pytest # pytest
# tox # tox
pre-commit==2.10.1 pre-commit==2.12.0
# via -r requirements/dev.in # via -r requirements/dev.in
py==1.10.0 py==1.10.0
# via # via
# pytest # pytest
# tox # tox
pygments==2.7.4 pygments==2.8.1
# via # via
# sphinx # sphinx
# sphinx-tabs # sphinx-tabs
pyparsing==2.4.7 pyparsing==2.4.7
# via packaging # via packaging
pytest==6.2.2 pytest==6.2.3
# via -r requirements/tests.in # via -r requirements/tests.in
python-dotenv==0.15.0 python-dotenv==0.17.0
# via -r requirements/tests.in # via -r requirements/tests.in
pytz==2021.1 pytz==2021.1
# via babel # via babel
@ -91,9 +94,9 @@ snowballstemmer==2.1.0
# via sphinx # via sphinx
sphinx-issues==1.2.0 sphinx-issues==1.2.0
# via -r requirements/docs.in # via -r requirements/docs.in
sphinx-tabs==2.0.1 sphinx-tabs==2.1.0
# via -r requirements/docs.in # via -r requirements/docs.in
sphinx==3.5.1 sphinx==3.5.4
# via # via
# -r requirements/docs.in # -r requirements/docs.in
# pallets-sphinx-themes # pallets-sphinx-themes
@ -116,14 +119,15 @@ sphinxcontrib-serializinghtml==1.1.4
# via sphinx # via sphinx
toml==0.10.2 toml==0.10.2
# via # via
# pep517
# pre-commit # pre-commit
# pytest # pytest
# tox # tox
tox==3.22.0 tox==3.23.0
# via -r requirements/dev.in # via -r requirements/dev.in
urllib3==1.26.4 urllib3==1.26.4
# via requests # via requests
virtualenv==20.4.2 virtualenv==20.4.3
# via # via
# pre-commit # pre-commit
# tox # tox

View file

@ -1,5 +1,4 @@
Pallets-Sphinx-Themes Pallets-Sphinx-Themes >= 2.0.0rc1
packaging
Sphinx Sphinx
sphinx-issues sphinx-issues
sphinxcontrib-log-cabinet sphinxcontrib-log-cabinet

View file

@ -24,12 +24,11 @@ markupsafe==1.1.1
# via jinja2 # via jinja2
packaging==20.9 packaging==20.9
# via # via
# -r requirements/docs.in
# pallets-sphinx-themes # pallets-sphinx-themes
# sphinx # sphinx
pallets-sphinx-themes==1.2.3 pallets-sphinx-themes==2.0.0rc1
# via -r requirements/docs.in # via -r requirements/docs.in
pygments==2.7.4 pygments==2.8.1
# via # via
# sphinx # sphinx
# sphinx-tabs # sphinx-tabs
@ -43,9 +42,9 @@ snowballstemmer==2.1.0
# via sphinx # via sphinx
sphinx-issues==1.2.0 sphinx-issues==1.2.0
# via -r requirements/docs.in # via -r requirements/docs.in
sphinx-tabs==2.0.1 sphinx-tabs==2.1.0
# via -r requirements/docs.in # via -r requirements/docs.in
sphinx==3.5.1 sphinx==3.5.4
# via # via
# -r requirements/docs.in # -r requirements/docs.in
# pallets-sphinx-themes # pallets-sphinx-themes

View file

@ -4,7 +4,7 @@
# #
# pip-compile requirements/tests.in # pip-compile requirements/tests.in
# #
asgiref==3.2.10 asgiref==3.3.4
# via -r requirements/tests.in # via -r requirements/tests.in
attrs==20.3.0 attrs==20.3.0
# via pytest # via pytest
@ -22,9 +22,9 @@ py==1.10.0
# via pytest # via pytest
pyparsing==2.4.7 pyparsing==2.4.7
# via packaging # via packaging
pytest==6.2.2 pytest==6.2.3
# via -r requirements/tests.in # via -r requirements/tests.in
python-dotenv==0.15.0 python-dotenv==0.17.0
# via -r requirements/tests.in # via -r requirements/tests.in
toml==0.10.2 toml==0.10.2
# via pytest # via pytest

View file

@ -4,10 +4,10 @@ from setuptools import setup
setup( setup(
name="Flask", name="Flask",
install_requires=[ install_requires=[
"Werkzeug>=0.15", "Werkzeug>=2.0.0rc4",
"Jinja2>=2.10.1", "Jinja2>=3.0.0rc1",
"itsdangerous>=0.24", "itsdangerous>=2.0.0rc2",
"click>=5.1", "click>=8.0.0rc1",
], ],
extras_require={ extras_require={
"async": ["asgiref>=3.2"], "async": ["asgiref>=3.2"],

View file

@ -43,4 +43,4 @@ from .signals import template_rendered
from .templating import render_template from .templating import render_template
from .templating import render_template_string from .templating import render_template_string
__version__ = "2.0.0.dev" __version__ = "2.0.0rc1"