Skip to content

Commit b34d342

Browse files
alexander-alderman-webbalexander-alderman-webb
committed
merge
2 parents d6c7379 + 3697471 commit b34d342

File tree

7 files changed

+53
-29
lines changed

7 files changed

+53
-29
lines changed

‎.github/workflows/test-integrations-misc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ jobs:
7474
run: |
7575
set -x # print commands that are executed
7676
./scripts/runtox.sh "py${{ matrix.python-version }}-typer"
77+
- name: Test integration_deactivation
78+
run: |
79+
set -x # print commands that are executed
80+
./scripts/runtox.sh "py${{ matrix.python-version }}-integration_deactivation"
7781
- name: Generate coverage XML (Python 3.6)
7882
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
7983
run: |

‎scripts/populate_tox/package_dependencies.jsonl‎

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

‎scripts/populate_tox/populate_tox.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"aws_lambda",
6565
"cloud_resource_context",
6666
"common",
67+
"integration_deactivation",
6768
"gcp",
6869
"gevent",
6970
"opentelemetry",

‎scripts/populate_tox/releases.jsonl‎

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

‎scripts/populate_tox/tox.jinja‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ envlist =
2323
# === Gevent ===
2424
{py3.6,py3.8,py3.10,py3.11,py3.12}-gevent
2525

26+
# === Integration Deactivation ===
27+
{py3.9,py3.10,py3.11,py3.12,py3.13,py3.14}-integration_deactivation
28+
2629
# === Integrations ===
2730

2831
# Asgi
@@ -88,6 +91,11 @@ deps =
8891
{py3.10,py3.11}-gevent: zope.event<5.0.0
8992
{py3.10,py3.11}-gevent: zope.interface<8.0
9093
94+
# === Integration Deactivation ===
95+
integration_deactivation: openai
96+
integration_deactivation: anthropic
97+
integration_deactivation: langchain
98+
9199
# === Integrations ===
92100
93101
# Asgi
@@ -144,6 +152,7 @@ setenv =
144152
# TESTPATH definitions for test suites not managed by toxgen
145153
common: TESTPATH=tests
146154
gevent: TESTPATH=tests
155+
integration_deactivation: TESTPATH=tests/test_ai_integration_deactivation.py
147156
asgi: TESTPATH=tests/integrations/asgi
148157
aws_lambda: TESTPATH=tests/integrations/aws_lambda
149158
cloud_resource_context: TESTPATH=tests/integrations/cloud_resource_context

‎scripts/split_tox_gh_actions/split_tox_gh_actions.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
"pure_eval",
155155
"trytond",
156156
"typer",
157+
"integration_deactivation",
157158
],
158159
}
159160

‎tox.ini‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ envlist =
2323
# === Gevent ===
2424
{py3.6,py3.8,py3.10,py3.11,py3.12}-gevent
2525

26+
# === Integration Deactivation ===
27+
{py3.9,py3.10,py3.11,py3.12,py3.13,py3.14}-integration_deactivation
28+
2629
# === Integrations ===
2730

2831
# Asgi
@@ -60,7 +63,7 @@ envlist =
6063
{py3.9,py3.12,py3.13}-google_genai-v1.29.0
6164
{py3.9,py3.12,py3.13}-google_genai-v1.35.0
6265
{py3.9,py3.12,py3.13}-google_genai-v1.41.0
63-
{py3.9,py3.13,py3.14,py3.14t}-google_genai-v1.47.0
66+
{py3.10,py3.13,py3.14,py3.14t}-google_genai-v1.48.0
6467

6568
{py3.8,py3.10,py3.11}-huggingface_hub-v0.24.7
6669
{py3.8,py3.12,py3.13}-huggingface_hub-v0.36.0
@@ -88,11 +91,11 @@ envlist =
8891

8992
{py3.8,py3.11,py3.12}-openai-base-v1.0.1
9093
{py3.8,py3.12,py3.13}-openai-base-v1.109.1
91-
{py3.9,py3.12,py3.13}-openai-base-v2.6.1
94+
{py3.9,py3.12,py3.13}-openai-base-v2.7.1
9295

9396
{py3.8,py3.11,py3.12}-openai-notiktoken-v1.0.1
9497
{py3.8,py3.12,py3.13}-openai-notiktoken-v1.109.1
95-
{py3.9,py3.12,py3.13}-openai-notiktoken-v2.6.1
98+
{py3.9,py3.12,py3.13}-openai-notiktoken-v2.7.1
9699

97100
{py3.10,py3.11,py3.12}-openai_agents-v0.0.19
98101
{py3.10,py3.12,py3.13}-openai_agents-v0.1.0
@@ -102,14 +105,14 @@ envlist =
102105
{py3.10,py3.12,py3.13}-pydantic_ai-v1.0.18
103106
{py3.10,py3.12,py3.13}-pydantic_ai-v1.3.0
104107
{py3.10,py3.12,py3.13}-pydantic_ai-v1.6.0
105-
{py3.10,py3.12,py3.13}-pydantic_ai-v1.9.1
108+
{py3.10,py3.12,py3.13}-pydantic_ai-v1.10.0
106109

107110

108111
# ~~~ Cloud ~~~
109112
{py3.6,py3.7}-boto3-v1.12.49
110113
{py3.6,py3.9,py3.10}-boto3-v1.20.54
111114
{py3.7,py3.11,py3.12}-boto3-v1.28.85
112-
{py3.9,py3.13,py3.14,py3.14t}-boto3-v1.40.64
115+
{py3.9,py3.13,py3.14,py3.14t}-boto3-v1.40.65
113116

114117
{py3.6,py3.7,py3.8}-chalice-v1.16.0
115118
{py3.9,py3.12,py3.13}-chalice-v1.32.0
@@ -236,7 +239,7 @@ envlist =
236239
{py3.6,py3.9,py3.10}-fastapi-v0.79.1
237240
{py3.7,py3.10,py3.11}-fastapi-v0.93.0
238241
{py3.8,py3.10,py3.11}-fastapi-v0.107.0
239-
{py3.8,py3.13,py3.14,py3.14t}-fastapi-v0.120.4
242+
{py3.8,py3.13,py3.14,py3.14t}-fastapi-v0.121.0
240243

241244

242245
# ~~~ Web 2 ~~~
@@ -325,6 +328,11 @@ deps =
325328
{py3.10,py3.11}-gevent: zope.event<5.0.0
326329
{py3.10,py3.11}-gevent: zope.interface<8.0
327330

331+
# === Integration Deactivation ===
332+
integration_deactivation: openai
333+
integration_deactivation: anthropic
334+
integration_deactivation: langchain
335+
328336
# === Integrations ===
329337

330338
# Asgi
@@ -365,7 +373,7 @@ deps =
365373
google_genai-v1.29.0: google-genai==1.29.0
366374
google_genai-v1.35.0: google-genai==1.35.0
367375
google_genai-v1.41.0: google-genai==1.41.0
368-
google_genai-v1.47.0: google-genai==1.47.0
376+
google_genai-v1.48.0: google-genai==1.48.0
369377
google_genai: pytest-asyncio
370378

371379
huggingface_hub-v0.24.7: huggingface_hub==0.24.7
@@ -408,14 +416,14 @@ deps =
408416

409417
openai-base-v1.0.1: openai==1.0.1
410418
openai-base-v1.109.1: openai==1.109.1
411-
openai-base-v2.6.1: openai==2.6.1
419+
openai-base-v2.7.1: openai==2.7.1
412420
openai-base: pytest-asyncio
413421
openai-base: tiktoken
414422
openai-base-v1.0.1: httpx<0.28
415423

416424
openai-notiktoken-v1.0.1: openai==1.0.1
417425
openai-notiktoken-v1.109.1: openai==1.109.1
418-
openai-notiktoken-v2.6.1: openai==2.6.1
426+
openai-notiktoken-v2.7.1: openai==2.7.1
419427
openai-notiktoken: pytest-asyncio
420428
openai-notiktoken-v1.0.1: httpx<0.28
421429

@@ -428,15 +436,15 @@ deps =
428436
pydantic_ai-v1.0.18: pydantic-ai==1.0.18
429437
pydantic_ai-v1.3.0: pydantic-ai==1.3.0
430438
pydantic_ai-v1.6.0: pydantic-ai==1.6.0
431-
pydantic_ai-v1.9.1: pydantic-ai==1.9.1
439+
pydantic_ai-v1.10.0: pydantic-ai==1.10.0
432440
pydantic_ai: pytest-asyncio
433441

434442

435443
# ~~~ Cloud ~~~
436444
boto3-v1.12.49: boto3==1.12.49
437445
boto3-v1.20.54: boto3==1.20.54
438446
boto3-v1.28.85: boto3==1.28.85
439-
boto3-v1.40.64: boto3==1.40.64
447+
boto3-v1.40.65: boto3==1.40.65
440448
{py3.7,py3.8}-boto3: urllib3<2.0.0
441449

442450
chalice-v1.16.0: chalice==1.16.0
@@ -640,7 +648,7 @@ deps =
640648
fastapi-v0.79.1: fastapi==0.79.1
641649
fastapi-v0.93.0: fastapi==0.93.0
642650
fastapi-v0.107.0: fastapi==0.107.0
643-
fastapi-v0.120.4: fastapi==0.120.4
651+
fastapi-v0.121.0: fastapi==0.121.0
644652
fastapi: httpx
645653
fastapi: pytest-asyncio
646654
fastapi: python-multipart
@@ -760,6 +768,7 @@ setenv =
760768
# TESTPATH definitions for test suites not managed by toxgen
761769
common: TESTPATH=tests
762770
gevent: TESTPATH=tests
771+
integration_deactivation: TESTPATH=tests/test_ai_integration_deactivation.py
763772
asgi: TESTPATH=tests/integrations/asgi
764773
aws_lambda: TESTPATH=tests/integrations/aws_lambda
765774
cloud_resource_context: TESTPATH=tests/integrations/cloud_resource_context

0 commit comments

Comments
 (0)