Skip to content

Commit

Permalink
Merge pull request #2086 from pallets/release-2.0.0rc4
Browse files Browse the repository at this point in the history
Release 2.0.0rc4
  • Loading branch information
davidism authored Apr 16, 2021
2 parents 38d859b + 99a235b commit a82e648
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repos:
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 3.9.0
rev: 3.9.1
hooks:
- id: flake8
additional_dependencies:
Expand All @@ -29,7 +29,7 @@ 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
exclude: "^tests/.*.http$"
39 changes: 21 additions & 18 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ babel==2.9.0
# via sphinx
certifi==2020.12.5
# via requests
cffi==1.14.4
cffi==1.14.5
# via cryptography
cfgv==3.2.0
# via pre-commit
chardet==4.0.0
# via requests
click==7.1.2
# via pip-tools
cryptography==3.4.6
cryptography==3.4.7
# via -r requirements/tests.in
distlib==0.3.1
# via virtualenv
Expand All @@ -34,7 +34,7 @@ filelock==3.0.12
# virtualenv
greenlet==1.0.0
# via -r requirements/tests.in
identify==1.5.12
identify==2.2.3
# via pre-commit
idna==2.10
# via requests
Expand All @@ -50,23 +50,25 @@ mypy-extensions==0.4.3
# via mypy
mypy==0.812
# via -r requirements/typing.in
nodeenv==1.5.0
nodeenv==1.6.0
# via pre-commit
packaging==20.8
packaging==20.9
# via
# 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
psutil==5.8.0
# via pytest-xprocess
Expand All @@ -76,35 +78,35 @@ py==1.10.0
# tox
pycparser==2.20
# via cffi
pygments==2.7.3
pygments==2.8.1
# via sphinx
pyparsing==2.4.7
# via packaging
pytest-timeout==1.4.2
# via -r requirements/tests.in
pytest-xprocess==0.17.0
pytest-xprocess==0.17.1
# via -r requirements/tests.in
pytest==6.2.2
pytest==6.2.3
# via
# -r requirements/tests.in
# -r requirements/typing.in
# pytest-timeout
# pytest-xprocess
pytz==2020.5
pytz==2021.1
# via babel
pyyaml==5.3.1
pyyaml==5.4.1
# via pre-commit
requests==2.25.1
# via sphinx
six==1.15.0
# via
# tox
# virtualenv
snowballstemmer==2.0.0
snowballstemmer==2.1.0
# via sphinx
sphinx-issues==1.2.0
# via -r requirements/docs.in
sphinx==3.5.1
sphinx==3.5.4
# via
# -r requirements/docs.in
# pallets-sphinx-themes
Expand All @@ -126,18 +128,19 @@ 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
typed-ast==1.4.2
typed-ast==1.4.3
# via mypy
typing-extensions==3.7.4.3
# via mypy
urllib3==1.26.4
# via requests
virtualenv==20.3.0
virtualenv==20.4.3
# via
# pre-commit
# tox
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Pallets-Sphinx-Themes
Pallets-Sphinx-Themes >= 2.0.0rc1
Sphinx
sphinx-issues
sphinxcontrib-log-cabinet
12 changes: 6 additions & 6 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ jinja2==2.11.3
# via sphinx
markupsafe==1.1.1
# via jinja2
packaging==20.8
packaging==20.9
# via
# pallets-sphinx-themes
# sphinx
pallets-sphinx-themes==1.2.3
pallets-sphinx-themes==2.0.0rc1
# via -r requirements/docs.in
pygments==2.7.3
pygments==2.8.1
# via sphinx
pyparsing==2.4.7
# via packaging
pytz==2020.5
pytz==2021.1
# via babel
requests==2.25.1
# via sphinx
snowballstemmer==2.0.0
snowballstemmer==2.1.0
# via sphinx
sphinx-issues==1.2.0
# via -r requirements/docs.in
sphinx==3.5.1
sphinx==3.5.4
# via
# -r requirements/docs.in
# pallets-sphinx-themes
Expand Down
10 changes: 5 additions & 5 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#
attrs==20.3.0
# via pytest
cffi==1.14.4
cffi==1.14.5
# via cryptography
cryptography==3.4.6
cryptography==3.4.7
# via -r requirements/tests.in
greenlet==1.0.0
# via -r requirements/tests.in
iniconfig==1.1.1
# via pytest
packaging==20.8
packaging==20.9
# via pytest
pluggy==0.13.1
# via pytest
Expand All @@ -28,9 +28,9 @@ pyparsing==2.4.7
# via packaging
pytest-timeout==1.4.2
# via -r requirements/tests.in
pytest-xprocess==0.17.0
pytest-xprocess==0.17.1
# via -r requirements/tests.in
pytest==6.2.2
pytest==6.2.3
# via
# -r requirements/tests.in
# pytest-timeout
Expand Down
6 changes: 3 additions & 3 deletions requirements/typing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ mypy-extensions==0.4.3
# via mypy
mypy==0.812
# via -r requirements/typing.in
packaging==20.8
packaging==20.9
# via pytest
pluggy==0.13.1
# via pytest
py==1.10.0
# via pytest
pyparsing==2.4.7
# via packaging
pytest==6.2.2
pytest==6.2.3
# via -r requirements/typing.in
toml==0.10.2
# via pytest
typed-ast==1.4.2
typed-ast==1.4.3
# via mypy
typing-extensions==3.7.4.3
# via mypy
2 changes: 1 addition & 1 deletion src/werkzeug/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
from .wrappers import Request
from .wrappers import Response

__version__ = "2.0.0rc4.dev"
__version__ = "2.0.0rc4"

0 comments on commit a82e648

Please sign in to comment.