Skip to content

Commit

Permalink
Merge pull request pallets#2372 from pallets/update-requirements
Browse files Browse the repository at this point in the history
update requirements
  • Loading branch information
davidism authored Apr 1, 2022
2 parents 1bfd5de + 7df72f9 commit 57e70b8
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 37 deletions.
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ ci:
autoupdate_schedule: monthly
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v2.31.1
hooks:
- id: pyupgrade
args: ["--py37-plus"]
- repo: https://github.com/asottile/reorder_python_imports
rev: v2.7.1
rev: v3.0.1
hooks:
- id: reorder-python-imports
name: Reorder Python imports (src, tests)
Expand All @@ -21,7 +21,7 @@ repos:
args: ["--application-directories", "examples"]
additional_dependencies: ["setuptools>60.9"]
- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
Expand All @@ -32,7 +32,7 @@ repos:
- flake8-bugbear
- flake8-implicit-str-concat
- repo: https://github.com/peterdemin/pip-compile-multi
rev: v2.4.3
rev: v2.4.4
hooks:
- id: pip-compile-multi-verify
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down
14 changes: 7 additions & 7 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@
-r typing.txt
cfgv==3.3.1
# via pre-commit
click==8.0.3
click==8.1.2
# via
# pip-compile-multi
# pip-tools
distlib==0.3.4
# via virtualenv
filelock==3.4.2
filelock==3.6.0
# via
# tox
# virtualenv
greenlet==1.1.2 ; python_version < "3.11"
# via -r requirements/tests.in
identify==2.4.8
identify==2.4.12
# via pre-commit
nodeenv==1.6.0
# via pre-commit
pep517==0.12.0
# via pip-tools
pip-compile-multi==2.4.3
pip-compile-multi==2.4.4
# via -r requirements/dev.in
pip-tools==6.5.0
pip-tools==6.5.1
# via pip-compile-multi
platformdirs==2.4.1
platformdirs==2.5.1
# via virtualenv
pre-commit==2.17.0
# via -r requirements/dev.in
Expand All @@ -50,7 +50,7 @@ toposort==1.7
# via pip-compile-multi
tox==3.24.5
# via -r requirements/dev.in
virtualenv==20.13.1
virtualenv==20.14.0
# via
# pre-commit
# tox
Expand Down
12 changes: 6 additions & 6 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ babel==2.9.1
# via sphinx
certifi==2021.10.8
# via requests
charset-normalizer==2.0.11
charset-normalizer==2.0.12
# via requests
docutils==0.17.1
# via sphinx
idna==3.3
# via requests
imagesize==1.3.0
# via sphinx
jinja2==3.0.3
jinja2==3.1.1
# via sphinx
markupsafe==2.0.1
markupsafe==2.1.1
# via jinja2
packaging==21.3
# via
Expand All @@ -33,13 +33,13 @@ pygments==2.11.2
# via sphinx
pyparsing==3.0.7
# via packaging
pytz==2021.3
pytz==2022.1
# via babel
requests==2.27.1
# via sphinx
snowballstemmer==2.2.0
# via sphinx
sphinx==4.4.0
sphinx==4.5.0
# via
# -r requirements/docs.in
# pallets-sphinx-themes
Expand All @@ -61,5 +61,5 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
urllib3==1.26.8
urllib3==1.26.9
# via requests
8 changes: 4 additions & 4 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ attrs==21.4.0
# via pytest
cffi==1.15.0
# via cryptography
cryptography==36.0.1
cryptography==36.0.2
# via -r requirements/tests.in
ephemeral-port-reserve==1.1.4
# via -r requirements/tests.in
Expand All @@ -29,7 +29,7 @@ pycparser==2.21
# via cffi
pyparsing==3.0.7
# via packaging
pytest==7.0.0
pytest==7.1.1
# via
# -r requirements/tests.in
# pytest-timeout
Expand All @@ -38,7 +38,7 @@ pytest-timeout==2.1.0
# via -r requirements/tests.in
pytest-xprocess==0.18.1
# via -r requirements/tests.in
tomli==2.0.0
tomli==2.0.1
# via pytest
watchdog==2.1.6
watchdog==2.1.7
# via -r requirements/tests.in
10 changes: 5 additions & 5 deletions requirements/typing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
#
# pip-compile-multi
#
mypy==0.931
mypy==0.942
# via -r requirements/typing.in
mypy-extensions==0.4.3
# via mypy
tomli==2.0.0
tomli==2.0.1
# via mypy
types-contextvars==2.4.2
types-contextvars==2.4.4
# via -r requirements/typing.in
types-dataclasses==0.6.4
# via -r requirements/typing.in
types-setuptools==57.4.9
types-setuptools==57.4.11
# via -r requirements/typing.in
typing-extensions==4.0.1
typing-extensions==4.1.1
# via mypy
21 changes: 15 additions & 6 deletions src/werkzeug/datastructures.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ from typing import Tuple
from typing import Type
from typing import TypeVar
from typing import Union
from _typeshed import SupportsKeysAndGetItem
from _typeshed.wsgi import WSGIEnvironment

from typing_extensions import Literal
Expand Down Expand Up @@ -96,9 +97,12 @@ class UpdateDictMixin(Dict[K, V]):
def __delitem__(self, key: K) -> None: ...
def clear(self) -> None: ...
def popitem(self) -> Tuple[K, V]: ...
def update(
self, *args: Union[Mapping[K, V], Iterable[Tuple[K, V]]], **kwargs: V
) -> None: ...
@overload
def update(self, __m: SupportsKeysAndGetItem[K, V], **kwargs: V) -> None: ...
@overload
def update(self, __m: Iterable[Tuple[K, V]], **kwargs: V) -> None: ...
@overload
def update(self, **kwargs: V) -> None: ...

class TypeConversionDict(Dict[K, V]):
@overload
Expand Down Expand Up @@ -274,11 +278,16 @@ class Headers(Dict[str, str]):
def __setitem__(self, key: int, value: Tuple[str, HV]) -> None: ...
@overload
def __setitem__(self, key: slice, value: Iterable[Tuple[str, HV]]) -> None: ...
@overload
def update(
self,
*args: Union[Mapping[str, HV], Iterable[Tuple[str, HV]]],
**kwargs: Union[HV, Iterable[HV]],
self, __m: SupportsKeysAndGetItem[str, HV], **kwargs: Union[HV, Iterable[HV]]
) -> None: ...
@overload
def update(
self, __m: Iterable[Tuple[str, HV]], **kwargs: Union[HV, Iterable[HV]]
) -> None: ...
@overload
def update(self, **kwargs: Union[HV, Iterable[HV]]) -> None: ...
def to_wsgi_list(self) -> List[Tuple[str, str]]: ...
def copy(self) -> Headers: ...
def __copy__(self) -> Headers: ...
Expand Down
2 changes: 1 addition & 1 deletion src/werkzeug/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def __get__(self, instance: "LocalProxy", owner: t.Optional[type] = None) -> t.A
if self.fallback is None:
raise

fallback = self.fallback.__get__(instance, owner) # type: ignore
fallback = self.fallback.__get__(instance, owner)

if self.is_attr:
# __class__ and __doc__ are attributes, not methods.
Expand Down
6 changes: 2 additions & 4 deletions src/werkzeug/routing.py
Original file line number Diff line number Diff line change
Expand Up @@ -882,11 +882,9 @@ def _build_regex(rule: str) -> None:
self._trace.append((False, "/"))

self._build: t.Callable[..., t.Tuple[str, str]]
self._build = self._compile_builder(False).__get__(self, None) # type: ignore
self._build = self._compile_builder(False).__get__(self, None)
self._build_unknown: t.Callable[..., t.Tuple[str, str]]
self._build_unknown = self._compile_builder(True).__get__( # type: ignore
self, None
)
self._build_unknown = self._compile_builder(True).__get__(self, None)

if self.build_only:
return
Expand Down

0 comments on commit 57e70b8

Please sign in to comment.