From 2cc39ea25b1a30ce447a02d74890e7daed743d60 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Tue, 29 Apr 2025 10:15:42 +0200 Subject: [PATCH 1/3] tests: Update tox.ini --- tox.ini | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 6f3b9863e8..0632a4e8e3 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ # The file (and all resulting CI YAMLs) then need to be regenerated via # "scripts/generate-test-files.sh". # -# Last generated: 2025-04-23T08:07:00.653648+00:00 +# Last generated: 2025-04-29T08:15:04.584844+00:00 [tox] requires = @@ -215,7 +215,7 @@ envlist = # ~~~ Tasks ~~~ {py3.6,py3.7,py3.8}-celery-v4.4.7 {py3.6,py3.7,py3.8}-celery-v5.0.5 - {py3.8,py3.12,py3.13}-celery-v5.5.1 + {py3.8,py3.12,py3.13}-celery-v5.5.2 {py3.6,py3.7}-dramatiq-v1.9.0 {py3.6,py3.8,py3.9}-dramatiq-v1.12.3 @@ -298,10 +298,10 @@ envlist = {py3.6}-trytond-v4.8.18 {py3.6,py3.7,py3.8}-trytond-v5.8.16 {py3.8,py3.10,py3.11}-trytond-v6.8.17 - {py3.8,py3.11,py3.12}-trytond-v7.0.29 - {py3.8,py3.11,py3.12}-trytond-v7.4.9 + {py3.8,py3.11,py3.12}-trytond-v7.0.30 + {py3.9,py3.12,py3.13}-trytond-v7.6.0 - {py3.7,py3.12,py3.13}-typer-v0.15.2 + {py3.7,py3.12,py3.13}-typer-v0.15.3 @@ -600,7 +600,7 @@ deps = # ~~~ Tasks ~~~ celery-v4.4.7: celery==4.4.7 celery-v5.0.5: celery==5.0.5 - celery-v5.5.1: celery==5.5.1 + celery-v5.5.2: celery==5.5.2 celery: newrelic celery: redis py3.7-celery: importlib-metadata<5.0 @@ -753,13 +753,13 @@ deps = trytond-v4.8.18: trytond==4.8.18 trytond-v5.8.16: trytond==5.8.16 trytond-v6.8.17: trytond==6.8.17 - trytond-v7.0.29: trytond==7.0.29 - trytond-v7.4.9: trytond==7.4.9 + trytond-v7.0.30: trytond==7.0.30 + trytond-v7.6.0: trytond==7.6.0 trytond: werkzeug trytond-v4.6.22: werkzeug<1.0 trytond-v4.8.18: werkzeug<1.0 - typer-v0.15.2: typer==0.15.2 + typer-v0.15.3: typer==0.15.3 From 0beed64447cbdaaa2bb1f8b77960ed046ad908aa Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Tue, 29 Apr 2025 10:20:43 +0200 Subject: [PATCH 2/3] tests: Move anthropic under toxgen --- .github/workflows/test-integrations-ai.yml | 4 ++-- scripts/populate_tox/config.py | 7 ++++++ scripts/populate_tox/populate_tox.py | 1 - scripts/populate_tox/tox.jinja | 12 ---------- tox.ini | 27 +++++++++++----------- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml index f392f57f46..84d05a7fbc 100644 --- a/.github/workflows/test-integrations-ai.yml +++ b/.github/workflows/test-integrations-ai.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7","3.9","3.11","3.12"] + python-version: ["3.9","3.11","3.12"] # 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 @@ -104,7 +104,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.7","3.8","3.9","3.10","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/scripts/populate_tox/config.py b/scripts/populate_tox/config.py index f874ff8a9c..d62fe794b6 100644 --- a/scripts/populate_tox/config.py +++ b/scripts/populate_tox/config.py @@ -14,6 +14,13 @@ }, "python": ">=3.7", }, + "anthropic": { + "package": "anthropic", + "deps": { + "*": ["pytest-asyncio"], + "<0.29": ["httpx<0.28.0"], + }, + }, "ariadne": { "package": "ariadne", "deps": { diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py index c04ab1b209..0aeb0f02ef 100644 --- a/scripts/populate_tox/populate_tox.py +++ b/scripts/populate_tox/populate_tox.py @@ -67,7 +67,6 @@ "potel", # Integrations that can be migrated -- we should eventually remove all # of these from the IGNORE list - "anthropic", "arq", "asyncpg", "beam", diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja index 3cfb5e1252..2869da275b 100644 --- a/scripts/populate_tox/tox.jinja +++ b/scripts/populate_tox/tox.jinja @@ -36,10 +36,6 @@ envlist = # At a minimum, we should test against at least the lowest # and the latest supported version of a framework. - # Anthropic - {py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40} - {py3.7,py3.11,py3.12}-anthropic-latest - # Arq {py3.7,py3.11}-arq-v{0.23} {py3.7,py3.12,py3.13}-arq-latest @@ -179,14 +175,6 @@ deps = # === Integrations === - # Anthropic - anthropic: pytest-asyncio - 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 - anthropic-latest: anthropic - # Arq arq-v0.23: arq~=0.23.0 arq-v0.23: pydantic<2 diff --git a/tox.ini b/tox.ini index 0632a4e8e3..489284958f 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ # The file (and all resulting CI YAMLs) then need to be regenerated via # "scripts/generate-test-files.sh". # -# Last generated: 2025-04-29T08:15:04.584844+00:00 +# Last generated: 2025-04-29T08:20:19.912101+00:00 [tox] requires = @@ -36,10 +36,6 @@ envlist = # At a minimum, we should test against at least the lowest # and the latest supported version of a framework. - # Anthropic - {py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40} - {py3.7,py3.11,py3.12}-anthropic-latest - # Arq {py3.7,py3.11}-arq-v{0.23} {py3.7,py3.12,py3.13}-arq-latest @@ -139,6 +135,11 @@ envlist = # integration tests there. # ~~~ AI ~~~ + {py3.7,py3.11,py3.12}-anthropic-v0.16.0 + {py3.7,py3.11,py3.12}-anthropic-v0.27.0 + {py3.7,py3.11,py3.12}-anthropic-v0.38.0 + {py3.8,py3.11,py3.12}-anthropic-v0.50.0 + {py3.9,py3.10,py3.11}-cohere-v5.4.0 {py3.9,py3.11,py3.12}-cohere-v5.8.1 {py3.9,py3.11,py3.12}-cohere-v5.11.4 @@ -335,14 +336,6 @@ deps = # === Integrations === - # Anthropic - anthropic: pytest-asyncio - 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 - anthropic-latest: anthropic - # Arq arq-v0.23: arq~=0.23.0 arq-v0.23: pydantic<2 @@ -506,6 +499,14 @@ deps = # integration tests there. # ~~~ AI ~~~ + anthropic-v0.16.0: anthropic==0.16.0 + anthropic-v0.27.0: anthropic==0.27.0 + anthropic-v0.38.0: anthropic==0.38.0 + anthropic-v0.50.0: anthropic==0.50.0 + anthropic: pytest-asyncio + anthropic-v0.16.0: httpx<0.28.0 + anthropic-v0.27.0: httpx<0.28.0 + cohere-v5.4.0: cohere==5.4.0 cohere-v5.8.1: cohere==5.8.1 cohere-v5.11.4: cohere==5.11.4 From b73b738753250e8d7f329751b1a6231603e0e51c Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Tue, 29 Apr 2025 10:35:56 +0200 Subject: [PATCH 3/3] adjust versions --- .github/workflows/test-integrations-ai.yml | 2 +- scripts/populate_tox/config.py | 3 ++- tox.ini | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml index 84d05a7fbc..bc89cb9afe 100644 --- a/.github/workflows/test-integrations-ai.yml +++ b/.github/workflows/test-integrations-ai.yml @@ -104,7 +104,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"] + python-version: ["3.8","3.9","3.10","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/scripts/populate_tox/config.py b/scripts/populate_tox/config.py index d62fe794b6..4d5d5b14ce 100644 --- a/scripts/populate_tox/config.py +++ b/scripts/populate_tox/config.py @@ -18,8 +18,9 @@ "package": "anthropic", "deps": { "*": ["pytest-asyncio"], - "<0.29": ["httpx<0.28.0"], + "<0.50": ["httpx<0.28.0"], }, + "python": ">=3.8", }, "ariadne": { "package": "ariadne", diff --git a/tox.ini b/tox.ini index 489284958f..4c05bcaa75 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ # The file (and all resulting CI YAMLs) then need to be regenerated via # "scripts/generate-test-files.sh". # -# Last generated: 2025-04-29T08:20:19.912101+00:00 +# Last generated: 2025-04-29T08:35:44.624881+00:00 [tox] requires = @@ -135,9 +135,9 @@ envlist = # integration tests there. # ~~~ AI ~~~ - {py3.7,py3.11,py3.12}-anthropic-v0.16.0 - {py3.7,py3.11,py3.12}-anthropic-v0.27.0 - {py3.7,py3.11,py3.12}-anthropic-v0.38.0 + {py3.8,py3.11,py3.12}-anthropic-v0.16.0 + {py3.8,py3.11,py3.12}-anthropic-v0.27.0 + {py3.8,py3.11,py3.12}-anthropic-v0.38.0 {py3.8,py3.11,py3.12}-anthropic-v0.50.0 {py3.9,py3.10,py3.11}-cohere-v5.4.0 @@ -506,6 +506,7 @@ deps = anthropic: pytest-asyncio anthropic-v0.16.0: httpx<0.28.0 anthropic-v0.27.0: httpx<0.28.0 + anthropic-v0.38.0: httpx<0.28.0 cohere-v5.4.0: cohere==5.4.0 cohere-v5.8.1: cohere==5.8.1