Skip to content

Commit ac75685

Browse files
committed
Merge branch 'master' into potel-base
2 parents 571ff3b + 815de9f commit ac75685

File tree

5 files changed

+26
-33
lines changed

5 files changed

+26
-33
lines changed

scripts/populate_tox/config.py

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
"clickhouse_driver": {
3030
"package": "clickhouse-driver",
3131
},
32+
"cohere": {
33+
"package": "cohere",
34+
"python": ">=3.9",
35+
},
3236
"django": {
3337
"package": "django",
3438
"deps": {

scripts/populate_tox/populate_tox.py

-8
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
"beam",
7575
"boto3",
7676
"chalice",
77-
"cohere",
7877
"gcp",
7978
"httpx",
8079
"langchain",
@@ -235,13 +234,6 @@ def get_supported_releases(
235234
integration, pypi_data["releases"], older_than
236235
)
237236

238-
# Determine Python support
239-
expected_python_versions = TEST_SUITE_CONFIG[integration].get("python")
240-
if expected_python_versions:
241-
expected_python_versions = SpecifierSet(expected_python_versions)
242-
else:
243-
expected_python_versions = SpecifierSet(f">={MIN_PYTHON_VERSION}")
244-
245237
def _supports_lowest(release: Version) -> bool:
246238
time.sleep(PYPI_COOLDOWN) # don't DoS PYPI
247239

scripts/populate_tox/tox.jinja

-8
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ envlist =
7676
# Cloud Resource Context
7777
{py3.7,py3.12,py3.13}-cloud_resource_context
7878

79-
# Cohere
80-
{py3.9,py3.11,py3.12}-cohere-v5
81-
{py3.9,py3.11,py3.12}-cohere-latest
82-
8379
# GCP
8480
{py3.7}-gcp
8581

@@ -237,10 +233,6 @@ deps =
237233
chalice-v1.16: chalice~=1.16.0
238234
chalice-latest: chalice
239235
240-
# Cohere
241-
cohere-v5: cohere~=5.3.3
242-
cohere-latest: cohere
243-
244236
# HTTPX
245237
httpx-v0.16: pytest-httpx==0.10.0
246238
httpx-v0.18: pytest-httpx==0.12.0

sentry_sdk/integrations/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ def iter_default_integrations(with_auto_enabling_integrations):
131131
"celery": (4, 4, 7),
132132
"chalice": (1, 16, 0),
133133
"clickhouse_driver": (0, 2, 0),
134+
"cohere": (5, 4, 0),
134135
"django": (2, 0),
135136
"dramatiq": (1, 9),
136137
"falcon": (3, 0),

tox.ini

+21-17
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# The file (and all resulting CI YAMLs) then need to be regenerated via
1111
# "scripts/generate-test-files.sh".
1212
#
13-
# Last generated: 2025-04-15T14:53:25.426657+00:00
13+
# Last generated: 2025-04-17T11:01:25.976599+00:00
1414

1515
[tox]
1616
requires =
@@ -76,10 +76,6 @@ envlist =
7676
# Cloud Resource Context
7777
{py3.7,py3.12,py3.13}-cloud_resource_context
7878

79-
# Cohere
80-
{py3.9,py3.11,py3.12}-cohere-v5
81-
{py3.9,py3.11,py3.12}-cohere-latest
82-
8379
# GCP
8480
{py3.7}-gcp
8581

@@ -141,6 +137,11 @@ envlist =
141137
# integration tests there.
142138

143139
# ~~~ AI ~~~
140+
{py3.9,py3.10,py3.11}-cohere-v5.4.0
141+
{py3.9,py3.11,py3.12}-cohere-v5.9.4
142+
{py3.9,py3.11,py3.12}-cohere-v5.13.9
143+
{py3.9,py3.11,py3.12}-cohere-v5.15.0
144+
144145
{py3.8,py3.10,py3.11}-huggingface_hub-v0.22.2
145146
{py3.8,py3.10,py3.11}-huggingface_hub-v0.25.2
146147
{py3.8,py3.12,py3.13}-huggingface_hub-v0.28.1
@@ -168,6 +169,7 @@ envlist =
168169
{py3.8,py3.12,py3.13}-launchdarkly-v9.8.1
169170
{py3.8,py3.12,py3.13}-launchdarkly-v9.9.0
170171
{py3.8,py3.12,py3.13}-launchdarkly-v9.10.0
172+
{py3.8,py3.12,py3.13}-launchdarkly-v9.11.0
171173

172174
{py3.8,py3.12,py3.13}-openfeature-v0.7.5
173175
{py3.9,py3.12,py3.13}-openfeature-v0.8.1
@@ -195,9 +197,9 @@ envlist =
195197
{py3.8,py3.12,py3.13}-graphene-v3.4.3
196198

197199
{py3.8,py3.10,py3.11}-strawberry-v0.209.8
198-
{py3.8,py3.11,py3.12}-strawberry-v0.227.7
199-
{py3.8,py3.11,py3.12}-strawberry-v0.245.0
200-
{py3.9,py3.12,py3.13}-strawberry-v0.264.0
200+
{py3.8,py3.11,py3.12}-strawberry-v0.228.0
201+
{py3.8,py3.12,py3.13}-strawberry-v0.247.2
202+
{py3.9,py3.12,py3.13}-strawberry-v0.265.1
201203

202204

203205
# ~~~ Network ~~~
@@ -379,10 +381,6 @@ deps =
379381
chalice-v1.16: chalice~=1.16.0
380382
chalice-latest: chalice
381383

382-
# Cohere
383-
cohere-v5: cohere~=5.3.3
384-
cohere-latest: cohere
385-
386384
# HTTPX
387385
httpx-v0.16: pytest-httpx==0.10.0
388386
httpx-v0.18: pytest-httpx==0.12.0
@@ -497,6 +495,11 @@ deps =
497495
# integration tests there.
498496

499497
# ~~~ AI ~~~
498+
cohere-v5.4.0: cohere==5.4.0
499+
cohere-v5.9.4: cohere==5.9.4
500+
cohere-v5.13.9: cohere==5.13.9
501+
cohere-v5.15.0: cohere==5.15.0
502+
500503
huggingface_hub-v0.22.2: huggingface_hub==0.22.2
501504
huggingface_hub-v0.25.2: huggingface_hub==0.25.2
502505
huggingface_hub-v0.28.1: huggingface_hub==0.28.1
@@ -525,6 +528,7 @@ deps =
525528
launchdarkly-v9.8.1: launchdarkly-server-sdk==9.8.1
526529
launchdarkly-v9.9.0: launchdarkly-server-sdk==9.9.0
527530
launchdarkly-v9.10.0: launchdarkly-server-sdk==9.10.0
531+
launchdarkly-v9.11.0: launchdarkly-server-sdk==9.11.0
528532

529533
openfeature-v0.7.5: openfeature-sdk==0.7.5
530534
openfeature-v0.8.1: openfeature-sdk==0.8.1
@@ -561,13 +565,13 @@ deps =
561565
py3.6-graphene: aiocontextvars
562566

563567
strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
564-
strawberry-v0.227.7: strawberry-graphql[fastapi,flask]==0.227.7
565-
strawberry-v0.245.0: strawberry-graphql[fastapi,flask]==0.245.0
566-
strawberry-v0.264.0: strawberry-graphql[fastapi,flask]==0.264.0
568+
strawberry-v0.228.0: strawberry-graphql[fastapi,flask]==0.228.0
569+
strawberry-v0.247.2: strawberry-graphql[fastapi,flask]==0.247.2
570+
strawberry-v0.265.1: strawberry-graphql[fastapi,flask]==0.265.1
567571
strawberry: httpx
568572
strawberry-v0.209.8: pydantic<2.11
569-
strawberry-v0.227.7: pydantic<2.11
570-
strawberry-v0.245.0: pydantic<2.11
573+
strawberry-v0.228.0: pydantic<2.11
574+
strawberry-v0.247.2: pydantic<2.11
571575

572576

573577
# ~~~ Network ~~~

0 commit comments

Comments
 (0)