From a217e9955569852d35ab1bc1351dd66ba807fc44 Mon Sep 17 00:00:00 2001 From: Stainless Bot <107565488+stainless-bot@users.noreply.github.com> Date: Mon, 4 Dec 2023 05:26:21 -0500 Subject: [PATCH] chore(package): lift anyio v4 restriction (#266) --- pyproject.toml | 4 ++-- requirements-dev.lock | 13 ++++++------- requirements.lock | 17 ++++++++--------- tests/test_client.py | 30 +++++++++++++++++++----------- 4 files changed, 35 insertions(+), 29 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 678097f4..23c6619c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ dependencies = [ "httpx>=0.23.0, <1", "pydantic>=1.9.0, <3", "typing-extensions>=4.5, <5", - "anyio>=3.5.0, <4", + "anyio>=3.5.0, <5", "distro>=1.7.0, <2", "sniffio", "tokenizers >= 0.13.0" @@ -49,7 +49,7 @@ dev-dependencies = [ "pyright==1.1.332", "mypy==1.7.1", "black==23.3.0", - "respx==0.19.2", + "respx==0.20.2", "pytest==7.1.1", "pytest-asyncio==0.21.1", "ruff==0.0.282", diff --git a/requirements-dev.lock b/requirements-dev.lock index 31342685..899a7e1f 100644 --- a/requirements-dev.lock +++ b/requirements-dev.lock @@ -8,7 +8,7 @@ -e file:. annotated-types==0.6.0 -anyio==3.7.1 +anyio==4.1.0 argcomplete==3.1.2 attrs==23.1.0 black==23.3.0 @@ -21,10 +21,10 @@ distlib==0.3.7 distro==1.8.0 exceptiongroup==1.1.3 filelock==3.12.4 -fsspec==2023.10.0 -h11==0.12.0 -httpcore==0.15.0 -httpx==0.23.0 +fsspec==2023.12.0 +h11==0.14.0 +httpcore==1.0.2 +httpx==0.25.2 huggingface-hub==0.16.4 idna==3.4 iniconfig==2.0.0 @@ -47,8 +47,7 @@ python-dateutil==2.8.2 pytz==2023.3.post1 pyyaml==6.0.1 requests==2.31.0 -respx==0.19.2 -rfc3986==1.5.0 +respx==0.20.2 ruff==0.0.282 six==1.16.0 sniffio==1.3.0 diff --git a/requirements.lock b/requirements.lock index 6386a2f7..54d268da 100644 --- a/requirements.lock +++ b/requirements.lock @@ -8,16 +8,16 @@ -e file:. annotated-types==0.6.0 -anyio==3.7.1 +anyio==4.1.0 certifi==2023.7.22 -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 distro==1.8.0 exceptiongroup==1.1.3 -filelock==3.12.4 -fsspec==2023.9.2 -h11==0.12.0 -httpcore==0.15.0 -httpx==0.23.0 +filelock==3.13.1 +fsspec==2023.12.0 +h11==0.14.0 +httpcore==1.0.2 +httpx==0.25.2 huggingface-hub==0.16.4 idna==3.4 packaging==23.2 @@ -25,9 +25,8 @@ pydantic==2.4.2 pydantic-core==2.10.1 pyyaml==6.0.1 requests==2.31.0 -rfc3986==1.5.0 sniffio==1.3.0 tokenizers==0.14.0 tqdm==4.66.1 typing-extensions==4.8.0 -urllib3==2.0.7 +urllib3==2.1.0 diff --git a/tests/test_client.py b/tests/test_client.py index 3ff1ef2b..83d1c953 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -6,7 +6,7 @@ import json import asyncio import inspect -from typing import Any, Dict, Union, cast +from typing import Any, Union, cast from unittest import mock import httpx @@ -366,7 +366,7 @@ def test_request_extra_query(self) -> None: ), ), ) - params = cast(Dict[str, str], dict(request.url.params)) + params = dict(request.url.params) assert params == {"my_query_param": "Foo"} # if both `query` and `extra_query` are given, they are merged @@ -380,7 +380,7 @@ def test_request_extra_query(self) -> None: ), ), ) - params = cast(Dict[str, str], dict(request.url.params)) + params = dict(request.url.params) assert params == {"bar": "1", "foo": "2"} # `extra_query` takes priority over `query` when keys clash @@ -394,7 +394,7 @@ def test_request_extra_query(self) -> None: ), ), ) - params = cast(Dict[str, str], dict(request.url.params)) + params = dict(request.url.params) assert params == {"foo": "2"} @pytest.mark.respx(base_url=base_url) @@ -541,7 +541,9 @@ def test_transport_option_is_deprecated(self) -> None: DeprecationWarning, match="The `transport` argument is deprecated. The `http_client` argument should be passed instead", ): - transport = httpx.MockTransport(lambda: None) + transport = httpx.MockTransport( + lambda: None, # type: ignore + ) client = Anthropic( base_url=base_url, api_key=api_key, _strict_response_validation=True, transport=transport @@ -557,7 +559,9 @@ def test_transport_option_mutually_exclusive_with_http_client(self) -> None: base_url=base_url, api_key=api_key, _strict_response_validation=True, - transport=httpx.MockTransport(lambda: None), + transport=httpx.MockTransport( + lambda: None, # type: ignore + ), http_client=http_client, ) @@ -1114,7 +1118,7 @@ def test_request_extra_query(self) -> None: ), ), ) - params = cast(Dict[str, str], dict(request.url.params)) + params = dict(request.url.params) assert params == {"my_query_param": "Foo"} # if both `query` and `extra_query` are given, they are merged @@ -1128,7 +1132,7 @@ def test_request_extra_query(self) -> None: ), ), ) - params = cast(Dict[str, str], dict(request.url.params)) + params = dict(request.url.params) assert params == {"bar": "1", "foo": "2"} # `extra_query` takes priority over `query` when keys clash @@ -1142,7 +1146,7 @@ def test_request_extra_query(self) -> None: ), ), ) - params = cast(Dict[str, str], dict(request.url.params)) + params = dict(request.url.params) assert params == {"foo": "2"} @pytest.mark.respx(base_url=base_url) @@ -1297,7 +1301,9 @@ def test_transport_option_is_deprecated(self) -> None: DeprecationWarning, match="The `transport` argument is deprecated. The `http_client` argument should be passed instead", ): - transport = httpx.MockTransport(lambda: None) + transport = httpx.MockTransport( + lambda: None, # type: ignore + ) client = AsyncAnthropic( base_url=base_url, api_key=api_key, _strict_response_validation=True, transport=transport @@ -1313,7 +1319,9 @@ async def test_transport_option_mutually_exclusive_with_http_client(self) -> Non base_url=base_url, api_key=api_key, _strict_response_validation=True, - transport=httpx.MockTransport(lambda: None), + transport=httpx.MockTransport( + lambda: None, # type: ignore + ), http_client=http_client, )