redo type annotations

.gitignore

@@ -23,3 +23,4 @@ test_uwsgi_failed
 venv/
 .vscode
 .mypy_cache/
+.dmypy.json

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.1.0
+    rev: v2.7.4
     hooks:
       - id: pyupgrade
         args: ["--py36-plus"]
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.1.0
+    rev: v2.3.6
     hooks:
       - id: reorder-python-imports
         name: Reorder Python imports (src, tests)
@@ -16,18 +16,18 @@ repos:
         files: "^examples/"
         args: ["--application-directories", "examples"]
   - repo: https://github.com/ambv/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+    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: v2.5.0
+    rev: v3.3.0
     hooks:
       - id: check-byte-order-marker
       - id: trailing-whitespace

MANIFEST.in

@@ -2,6 +2,7 @@ include CHANGES.rst
 include tox.ini
 include requirements/*.txt
 include src/werkzeug/py.typed
+include src/werkzeug/*.pyi
 graft artwork
 graft docs
 prune docs/_build

requirements/dev.txt

@@ -4,63 +4,145 @@
 #
 #    pip-compile requirements/dev.in
 #
-alabaster==0.7.12         # via sphinx
-appdirs==1.4.4            # via virtualenv
-attrs==19.3.0             # via pytest
-babel==2.8.0              # via sphinx
-certifi==2020.4.5.1       # via requests
-cffi==1.14.0              # via cryptography
-cfgv==3.1.0               # via pre-commit
-chardet==3.0.4            # via requests
-click==7.1.2              # via pip-tools
-cryptography==3.3.1       # via -r requirements/tests.in
-distlib==0.3.0            # 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.15          # via pre-commit
-idna==2.9                 # via requests
-imagesize==1.2.0          # via sphinx
-iniconfig==1.0.0          # via pytest
-jinja2==2.11.2            # via sphinx
-markupsafe==1.1.1         # via jinja2
-mypy-extensions==0.4.3    # via mypy
-mypy==0.782               # via -r requirements/typing.in
-nodeenv==1.3.5            # via pre-commit
-packaging==20.3           # via pallets-sphinx-themes, pytest, sphinx, tox
-pallets-sphinx-themes==1.2.3  # via -r requirements/docs.in
-pip-tools==5.5.0          # via -r requirements/dev.in
-pluggy==0.13.1            # via pytest, tox
-pre-commit==2.9.3         # via -r requirements/dev.in
-psutil==5.7.0             # via pytest-xprocess
-py==1.9.0                 # via pytest, tox
-pycparser==2.20           # via cffi
-pygments==2.6.1           # via sphinx
-pyparsing==2.4.7          # via packaging
-pytest-timeout==1.4.2     # via -r requirements/tests.in
-pytest-xprocess==0.17.0   # via -r requirements/tests.in
-pytest==6.1.2             # via -r requirements/tests.in, pytest-timeout, pytest-xprocess
-pytz==2020.1              # via babel
-pyyaml==5.3.1             # via pre-commit
-requests==2.24.0          # via sphinx
-six==1.14.0               # via cryptography, packaging, tox, virtualenv
-snowballstemmer==2.0.0    # via sphinx
-sphinx-issues==1.2.0      # via -r requirements/docs.in
-sphinx==3.4.1             # via -r requirements/docs.in, pallets-sphinx-themes, sphinx-issues, sphinxcontrib-log-cabinet
-sphinxcontrib-applehelp==1.0.2  # via sphinx
-sphinxcontrib-devhelp==1.0.2  # via sphinx
-sphinxcontrib-htmlhelp==1.0.3  # via sphinx
-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
-tox==3.20.1               # via -r requirements/dev.in
-typed-ast==1.4.1          # via mypy
-typing-extensions==3.7.4.3  # via mypy
-urllib3==1.25.9           # via requests
-virtualenv==20.0.20       # via pre-commit, tox
-watchdog==1.0.2           # via -r requirements/tests.in
+alabaster==0.7.12
+    # via sphinx
+appdirs==1.4.4
+    # via virtualenv
+attrs==20.3.0
+    # via pytest
+babel==2.9.0
+    # via sphinx
+certifi==2020.12.5
+    # via requests
+cffi==1.14.4
+    # via cryptography
+cfgv==3.2.0
+    # via pre-commit
+chardet==4.0.0
+    # via requests
+click==7.1.2
+    # via pip-tools
+cryptography==3.3.1
+    # via -r requirements/tests.in
+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.5.12
+    # via pre-commit
+idna==2.10
+    # via requests
+imagesize==1.2.0
+    # via sphinx
+iniconfig==1.1.1
+    # via pytest
+jinja2==2.11.2
+    # via sphinx
+markupsafe==1.1.1
+    # via jinja2
+mypy-extensions==0.4.3
+    # via mypy
+mypy==0.790
+    # via -r requirements/typing.in
+nodeenv==1.5.0
+    # via pre-commit
+packaging==20.8
+    # via
+    #   pallets-sphinx-themes
+    #   pytest
+    #   sphinx
+    #   tox
+pallets-sphinx-themes==1.2.3
+    # via -r requirements/docs.in
+pip-tools==5.5.0
+    # via -r requirements/dev.in
+pluggy==0.13.1
+    # via
+    #   pytest
+    #   tox
+pre-commit==2.9.3
+    # via -r requirements/dev.in
+psutil==5.8.0
+    # via pytest-xprocess
+py==1.10.0
+    # via
+    #   pytest
+    #   tox
+pycparser==2.20
+    # via cffi
+pygments==2.7.3
+    # via sphinx
+pyparsing==2.4.7
+    # via packaging
+pytest-timeout==1.4.2
+    # via -r requirements/tests.in
+pytest-xprocess==0.17.0
+    # via -r requirements/tests.in
+pytest==6.1.2
+    # via
+    #   -r requirements/tests.in
+    #   pytest-timeout
+    #   pytest-xprocess
+pytz==2020.5
+    # via babel
+pyyaml==5.3.1
+    # via pre-commit
+requests==2.25.1
+    # via sphinx
+six==1.15.0
+    # via
+    #   cryptography
+    #   tox
+    #   virtualenv
+snowballstemmer==2.0.0
+    # via sphinx
+sphinx-issues==1.2.0
+    # via -r requirements/docs.in
+sphinx==3.4.3
+    # via
+    #   -r requirements/docs.in
+    #   pallets-sphinx-themes
+    #   sphinx-issues
+    #   sphinxcontrib-log-cabinet
+sphinxcontrib-applehelp==1.0.2
+    # via sphinx
+sphinxcontrib-devhelp==1.0.2
+    # via sphinx
+sphinxcontrib-htmlhelp==1.0.3
+    # via sphinx
+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.2
+    # via
+    #   pre-commit
+    #   pytest
+    #   tox
+tox==3.21.0
+    # via -r requirements/dev.in
+typed-ast==1.4.2
+    # via mypy
+typing-extensions==3.7.4.3
+    # via mypy
+urllib3==1.26.2
+    # via requests
+virtualenv==20.3.0
+    # via
+    #   pre-commit
+    #   tox
+watchdog==1.0.2
+    # via -r requirements/tests.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/docs.txt

@@ -4,33 +4,64 @@
 #
 #    pip-compile requirements/docs.in
 #
-alabaster==0.7.12         # via sphinx
-babel==2.8.0              # via sphinx
-certifi==2020.4.5.1       # via requests
-chardet==3.0.4            # via requests
-docutils==0.16            # via sphinx
-idna==2.9                 # via requests
-imagesize==1.2.0          # via sphinx
-jinja2==2.11.2            # via sphinx
-markupsafe==1.1.1         # via jinja2
-packaging==20.3           # via pallets-sphinx-themes, sphinx
-pallets-sphinx-themes==1.2.3  # via -r requirements/docs.in
-pygments==2.6.1           # via sphinx
-pyparsing==2.4.7          # via packaging
-pytz==2020.1              # via babel
-requests==2.24.0          # via sphinx
-six==1.14.0               # via packaging
-snowballstemmer==2.0.0    # via sphinx
-sphinx-issues==1.2.0      # via -r requirements/docs.in
-sphinx==3.4.1             # via -r requirements/docs.in, pallets-sphinx-themes, sphinx-issues, sphinxcontrib-log-cabinet
-sphinxcontrib-applehelp==1.0.2  # via sphinx
-sphinxcontrib-devhelp==1.0.2  # via sphinx
-sphinxcontrib-htmlhelp==1.0.3  # via sphinx
-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
+alabaster==0.7.12
+    # via sphinx
+babel==2.9.0
+    # via sphinx
+certifi==2020.12.5
+    # via requests
+chardet==4.0.0
+    # via requests
+docutils==0.16
+    # via sphinx
+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.8
+    # via
+    #   pallets-sphinx-themes
+    #   sphinx
+pallets-sphinx-themes==1.2.3
+    # via -r requirements/docs.in
+pygments==2.7.3
+    # via sphinx
+pyparsing==2.4.7
+    # via packaging
+pytz==2020.5
+    # via babel
+requests==2.25.1
+    # via sphinx
+snowballstemmer==2.0.0
+    # via sphinx
+sphinx-issues==1.2.0
+    # via -r requirements/docs.in
+sphinx==3.4.3
+    # via
+    #   -r requirements/docs.in
+    #   pallets-sphinx-themes
+    #   sphinx-issues
+    #   sphinxcontrib-log-cabinet
+sphinxcontrib-applehelp==1.0.2
+    # via sphinx
+sphinxcontrib-devhelp==1.0.2
+    # via sphinx
+sphinxcontrib-htmlhelp==1.0.3
+    # via sphinx
+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.26.2
+    # via requests
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools