From 55576339c377288723994cf6a71bea71514b8861 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 09:31:38 +0100 Subject: [PATCH 01/11] fix litestar tests --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 6acff6b8e8..c7c064c710 100644 --- a/tox.ini +++ b/tox.ini @@ -530,6 +530,7 @@ deps = litestar: python-multipart litestar: requests litestar: cryptography + litestar: httpx<0.27.2 litestar-v2.0: litestar~=2.0.0 litestar-v2.3: litestar~=2.3.0 litestar-v2.5: litestar~=2.5.0 From cae4136370fd1b109281e98bea04dcfbde5e609a Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 09:38:57 +0100 Subject: [PATCH 02/11] also starlite --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index c7c064c710..9f716c99d4 100644 --- a/tox.ini +++ b/tox.ini @@ -674,6 +674,7 @@ deps = starlite: requests starlite: cryptography starlite: pydantic<2.0.0 + starlite: httpx<0.27.2 starlite-v{1.48}: starlite~=1.48.0 starlite-v{1.51}: starlite~=1.51.0 From b46b1831b46e6f52fac7dd3d741f7196a42c9d6f Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 09:41:51 +0100 Subject: [PATCH 03/11] . --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 9f716c99d4..f709a59da2 100644 --- a/tox.ini +++ b/tox.ini @@ -173,6 +173,7 @@ envlist = # litestar 2.3.0 is the earliest version that supports Python 3.12 {py3.12}-litestar-v{2.3} {py3.8,py3.11,py3.12}-litestar-v{2.5} + {py3.8,py3.11,py3.12}-litestar-v{2.10} {py3.8,py3.11,py3.12}-litestar-latest # Loguru @@ -530,10 +531,11 @@ deps = litestar: python-multipart litestar: requests litestar: cryptography - litestar: httpx<0.27.2 + litestar-v{2.0,2.3,2.5}: httpx<0.28 litestar-v2.0: litestar~=2.0.0 litestar-v2.3: litestar~=2.3.0 litestar-v2.5: litestar~=2.5.0 + litestar-v2.10: litestar~=2.10.0 litestar-latest: litestar # Loguru @@ -674,7 +676,7 @@ deps = starlite: requests starlite: cryptography starlite: pydantic<2.0.0 - starlite: httpx<0.27.2 + starlite: httpx<0.28 starlite-v{1.48}: starlite~=1.48.0 starlite-v{1.51}: starlite~=1.51.0 From 5913721a4f866642de8374abce70075e1f8194b0 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 09:47:51 +0100 Subject: [PATCH 04/11] anthropic too --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f709a59da2..675857cc6d 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,7 @@ envlist = {py3.8,py3.12,py3.13}-aiohttp-latest # Anthropic - {py3.7,py3.11,py3.12}-anthropic-v{0.16,0.25} + {py3.7,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40} {py3.7,py3.11,py3.12}-anthropic-latest # Ariadne @@ -327,8 +327,10 @@ deps = # Anthropic anthropic: pytest-asyncio - anthropic-v0.25: anthropic~=0.25.0 + anthropic-v{0.16,0.28}: httpx<2.8.0 anthropic-v0.16: anthropic~=0.16.0 + anthropic-v0.28: anthropic~=0.28.0 + anthropic-v0.40: anthropic~=0.40.0 anthropic-latest: anthropic # Ariadne From f7a504201991002dffbf1fb616cbf10c0772f32b Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 09:50:27 +0100 Subject: [PATCH 05/11] clean up litestar too --- tox.ini | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 675857cc6d..829b80bed6 100644 --- a/tox.ini +++ b/tox.ini @@ -168,12 +168,9 @@ envlist = {py3.9,py3.11,py3.12}-langchain-notiktoken # Litestar - # litestar 2.0.0 is the earliest version that supports Python < 3.12 {py3.8,py3.11}-litestar-v{2.0} - # litestar 2.3.0 is the earliest version that supports Python 3.12 - {py3.12}-litestar-v{2.3} - {py3.8,py3.11,py3.12}-litestar-v{2.5} - {py3.8,py3.11,py3.12}-litestar-v{2.10} + {py3.8,py3.11,py3.12}-litestar-v{2.6} + {py3.8,py3.11,py3.12}-litestar-v{2.12} {py3.8,py3.11,py3.12}-litestar-latest # Loguru @@ -533,11 +530,10 @@ deps = litestar: python-multipart litestar: requests litestar: cryptography - litestar-v{2.0,2.3,2.5}: httpx<0.28 + litestar-v{2.0,2.6}: httpx<0.28 litestar-v2.0: litestar~=2.0.0 - litestar-v2.3: litestar~=2.3.0 - litestar-v2.5: litestar~=2.5.0 - litestar-v2.10: litestar~=2.10.0 + litestar-v2.6: litestar~=2.6.0 + litestar-v2.12: litestar~=2.12.0 litestar-latest: litestar # Loguru From 74589f03520beffb76e120aafbb02963dcec9ebd Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 09:52:25 +0100 Subject: [PATCH 06/11] fix --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 829b80bed6..78536ebee9 100644 --- a/tox.ini +++ b/tox.ini @@ -324,7 +324,7 @@ deps = # Anthropic anthropic: pytest-asyncio - anthropic-v{0.16,0.28}: httpx<2.8.0 + anthropic-v{0.16,0.28}: httpx<0.28.0 anthropic-v0.16: anthropic~=0.16.0 anthropic-v0.28: anthropic~=0.28.0 anthropic-v0.40: anthropic~=0.40.0 From 31d105153cc84ecad2374d10a337926f33ff15fe Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 09:57:59 +0100 Subject: [PATCH 07/11] langchain too --- tox.ini | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index 78536ebee9..0df99b8e2c 100644 --- a/tox.ini +++ b/tox.ini @@ -164,6 +164,7 @@ envlist = # Langchain {py3.9,py3.11,py3.12}-langchain-v0.1 + {py3.9,py3.11,py3.12}-langchain-v0.3 {py3.9,py3.11,py3.12}-langchain-latest {py3.9,py3.11,py3.12}-langchain-notiktoken @@ -517,13 +518,14 @@ deps = langchain-v0.1: openai~=1.0.0 langchain-v0.1: langchain~=0.1.11 langchain-v0.1: tiktoken~=0.6.0 - langchain-latest: langchain - langchain-latest: langchain-openai - langchain-latest: openai>=1.6.1 + langchain-v0.1: httpx<0.28.0 + langchain-v0.3: langchain~=0.3.0 + langchain-v0.3: tiktoken + langchain-v0.3: openai + langchain-{latest,notiktoken}: langchain + langchain-{latest,notiktoken}: langchain-openai + langchain-{latest,notiktoken}: openai>=1.6.1 langchain-latest: tiktoken~=0.6.0 - langchain-notiktoken: langchain - langchain-notiktoken: langchain-openai - langchain-notiktoken: openai>=1.6.1 # Litestar litestar: pytest-asyncio From bf5c506ac41eac27f2090f33074c887505628466 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 10:02:14 +0100 Subject: [PATCH 08/11] . --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 0df99b8e2c..5ce864b587 100644 --- a/tox.ini +++ b/tox.ini @@ -520,6 +520,7 @@ deps = langchain-v0.1: tiktoken~=0.6.0 langchain-v0.1: httpx<0.28.0 langchain-v0.3: langchain~=0.3.0 + langchain-v0.3: langchain-community langchain-v0.3: tiktoken langchain-v0.3: openai langchain-{latest,notiktoken}: langchain From fd280110a760358e2655e7c490c7e65010999fd2 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 10:09:11 +0100 Subject: [PATCH 09/11] . --- .github/workflows/test-integrations-ai.yml | 2 +- tox.ini | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml index c7cf4a1d85..7e48f62d06 100644 --- a/.github/workflows/test-integrations-ai.yml +++ b/.github/workflows/test-integrations-ai.yml @@ -99,7 +99,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7","3.9","3.11","3.12","3.13"] + python-version: ["3.8","3.9","3.11","3.12","3.13"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/tox.ini b/tox.ini index 5ce864b587..1306b8a958 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,7 @@ envlist = {py3.8,py3.12,py3.13}-aiohttp-latest # Anthropic - {py3.7,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40} + {py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40} {py3.7,py3.11,py3.12}-anthropic-latest # Ariadne @@ -179,7 +179,9 @@ envlist = {py3.6,py3.12,py3.13}-loguru-latest # OpenAI - {py3.9,py3.11,py3.12}-openai-v1 + {py3.9,py3.11,py3.12}-openai-v1.0 + {py3.9,py3.11,py3.12}-openai-v1.22 + {py3.9,py3.11,py3.12}-openai-v1.55 {py3.9,py3.11,py3.12}-openai-latest {py3.9,py3.11,py3.12}-openai-notiktoken @@ -545,8 +547,14 @@ deps = # OpenAI openai: pytest-asyncio - openai-v1: openai~=1.0.0 - openai-v1: tiktoken~=0.6.0 + openai-v1.0: openai~=1.0.0 + openai-v1.0: tiktoken + openai-v1.0: httpx<0.28.0 + openai-v1.22: openai~=1.22.0 + openai-v1.22: tiktoken + openai-v1.22: httpx<0.28.0 + openai-v1.55: openai~=1.55.0 + openai-v1.55: tiktoken openai-latest: openai openai-latest: tiktoken~=0.6.0 openai-notiktoken: openai From c21b6cea24cbf14421258a61b81488c15bc7a17d Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 10:23:45 +0100 Subject: [PATCH 10/11] . --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 1306b8a958..f82a798118 100644 --- a/tox.ini +++ b/tox.ini @@ -407,6 +407,7 @@ deps = django: psycopg2-binary django-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0 django-v{2.0,2.2,3.0,3.2,4.0,4.1,4.2,5.0,5.1}: channels[daphne] + django-v{2.2,3.0}: six django-v{1.11,2.0,2.2,3.0,3.2}: Werkzeug<2.1.0 django-v{1.11,2.0,2.2,3.0}: pytest-django<4.0 django-v{3.2,4.0,4.1,4.2,5.0,5.1}: pytest-django From 90ff658d7d7d3b2b05ad783d8d4ac6dfbfc9a604 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 2 Dec 2024 10:42:32 +0100 Subject: [PATCH 11/11] starlette --- tox.ini | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index f82a798118..0ecd2b697b 100644 --- a/tox.ini +++ b/tox.ini @@ -257,8 +257,8 @@ envlist = # Starlette {py3.7,py3.10}-starlette-v{0.19} - {py3.7,py3.11}-starlette-v{0.20,0.24,0.28} - {py3.8,py3.11,py3.12}-starlette-v{0.32,0.36} + {py3.7,py3.11}-starlette-v{0.24,0.28} + {py3.8,py3.11,py3.12}-starlette-v{0.32,0.36,0.40} {py3.8,py3.12,py3.13}-starlette-latest # Starlite @@ -668,16 +668,18 @@ deps = starlette: pytest-asyncio starlette: python-multipart starlette: requests - starlette: httpx # (this is a dependency of httpx) starlette: anyio<4.0.0 starlette: jinja2 + starlette-v{0.19,0.24,0.28,0.32,0.36}: httpx<0.28.0 + starlette-v0.40: httpx + starlette-latest: httpx starlette-v0.19: starlette~=0.19.0 - starlette-v0.20: starlette~=0.20.0 starlette-v0.24: starlette~=0.24.0 starlette-v0.28: starlette~=0.28.0 starlette-v0.32: starlette~=0.32.0 starlette-v0.36: starlette~=0.36.0 + starlette-v0.40: starlette~=0.40.0 starlette-latest: starlette # Starlite