Merge branch 'master' into webb/check-null-openai

Author: alexander-alderman-webb

scripts/populate_tox/config.py

@@ -103,6 +103,7 @@
                 "Werkzeug<2.1.0",
             ],
             "<3.1": ["pytest-django<4.0"],
+            "py3.14,py3.14t": ["coverage==7.11.0"],
         },
     },
     "dramatiq": {

scripts/populate_tox/package_dependencies.jsonl

@@ -1760,6 +1760,12 @@ def _normalize_module_name(name):
     return name.lower()
 
 
+def _replace_hyphens_dots_and_underscores_with_dashes(name):
+    # type: (str) -> str
+    # https://peps.python.org/pep-0503/#normalized-names
+    return re.sub(r"[-_.]+", "-", name)
+
+
 def _get_installed_modules():
     # type: () -> Dict[str, str]
     global _installed_modules
@@ -1770,8 +1776,15 @@ def _get_installed_modules():
 
 def package_version(package):
     # type: (str) -> Optional[Tuple[int, ...]]
-    installed_packages = _get_installed_modules()
-    version = installed_packages.get(package)
+    normalized_package = _normalize_module_name(
+        _replace_hyphens_dots_and_underscores_with_dashes(package)
+    )
+
+    installed_packages = {
+        _replace_hyphens_dots_and_underscores_with_dashes(module): v
+        for module, v in _get_installed_modules().items()
+    }
+    version = installed_packages.get(normalized_package)
     if version is None:
         return None
 

scripts/populate_tox/releases.jsonl

@@ -266,6 +266,7 @@ def test_minimum_unique_samples_required(
 
 
 @pytest.mark.forked
+@pytest.mark.skipif(sys.version_info >= (3, 14), reason="Test flakes blocking release.")
 def test_profile_captured(
     sentry_init,
     capture_envelopes,

sentry_sdk/utils.py

@@ -1,4 +1,5 @@
 import inspect
+import sys
 from unittest import mock
 
 import pytest
@@ -69,6 +70,7 @@ async def test_trace_decorator_async():
 
 
 @pytest.mark.asyncio
+@pytest.mark.skipif(sys.version_info >= (3, 14), reason="Test flakes blocking release.")
 async def test_trace_decorator_async_no_trx():
     with patch_start_tracing_child(fake_transaction_is_none=True):
         with mock.patch.object(logger, "debug", mock.Mock()) as fake_debug:

tests/profiler/test_transaction_profiler.py

@@ -61,21 +61,21 @@ envlist =
     {py3.9,py3.11,py3.12}-cohere-v5.20.0
 
     {py3.9,py3.12,py3.13}-google_genai-v1.29.0
-    {py3.9,py3.12,py3.13}-google_genai-v1.35.0
-    {py3.9,py3.12,py3.13}-google_genai-v1.41.0
-    {py3.10,py3.13,py3.14,py3.14t}-google_genai-v1.48.0
+    {py3.9,py3.12,py3.13}-google_genai-v1.36.0
+    {py3.9,py3.12,py3.13}-google_genai-v1.43.0
+    {py3.10,py3.13,py3.14,py3.14t}-google_genai-v1.49.0
 
     {py3.8,py3.10,py3.11}-huggingface_hub-v0.24.7
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.36.0
-    {py3.9,py3.12,py3.13}-huggingface_hub-v1.0.1
+    {py3.9,py3.13,py3.14,py3.14t}-huggingface_hub-v1.1.2
 
     {py3.9,py3.11,py3.12}-langchain-base-v0.1.20
     {py3.9,py3.12,py3.13}-langchain-base-v0.3.27
-    {py3.10,py3.13,py3.14}-langchain-base-v1.0.3
+    {py3.10,py3.13,py3.14}-langchain-base-v1.0.4
 
     {py3.9,py3.11,py3.12}-langchain-notiktoken-v0.1.20
     {py3.9,py3.12,py3.13}-langchain-notiktoken-v0.3.27
-    {py3.10,py3.13,py3.14}-langchain-notiktoken-v1.0.3
+    {py3.10,py3.13,py3.14}-langchain-notiktoken-v1.0.4
 
     {py3.9,py3.13,py3.14}-langgraph-v0.6.11
     {py3.10,py3.12,py3.13}-langgraph-v1.0.2
@@ -87,7 +87,7 @@ envlist =
     {py3.10,py3.12,py3.13}-mcp-v1.15.0
     {py3.10,py3.12,py3.13}-mcp-v1.17.0
     {py3.10,py3.12,py3.13}-mcp-v1.19.0
-    {py3.10,py3.12,py3.13}-mcp-v1.20.0
+    {py3.10,py3.12,py3.13}-mcp-v1.21.0
 
     {py3.8,py3.11,py3.12}-openai-base-v1.0.1
     {py3.8,py3.12,py3.13}-openai-base-v1.109.1
@@ -98,9 +98,9 @@ envlist =
     {py3.9,py3.12,py3.13}-openai-notiktoken-v2.7.1
 
     {py3.10,py3.11,py3.12}-openai_agents-v0.0.19
-    {py3.10,py3.12,py3.13}-openai_agents-v0.1.0
     {py3.10,py3.12,py3.13}-openai_agents-v0.2.11
     {py3.10,py3.12,py3.13}-openai_agents-v0.4.2
+    {py3.10,py3.13,py3.14,py3.14t}-openai_agents-v0.5.0
 
     {py3.10,py3.12,py3.13}-pydantic_ai-v1.0.18
     {py3.10,py3.12,py3.13}-pydantic_ai-v1.3.0
@@ -112,7 +112,7 @@ envlist =
     {py3.6,py3.7}-boto3-v1.12.49
     {py3.6,py3.9,py3.10}-boto3-v1.20.54
     {py3.7,py3.11,py3.12}-boto3-v1.28.85
-    {py3.9,py3.13,py3.14,py3.14t}-boto3-v1.40.65
+    {py3.9,py3.13,py3.14,py3.14t}-boto3-v1.40.68
 
     {py3.6,py3.7,py3.8}-chalice-v1.16.0
     {py3.9,py3.12,py3.13}-chalice-v1.32.0
@@ -171,7 +171,7 @@ envlist =
     {py3.8,py3.12,py3.13}-graphene-v3.4.3
 
     {py3.8,py3.10,py3.11}-strawberry-v0.209.8
-    {py3.10,py3.13,py3.14,py3.14t}-strawberry-v0.284.1
+    {py3.10,py3.13,py3.14,py3.14t}-strawberry-v0.284.2
 
 
     # ~~~ Network ~~~
@@ -223,8 +223,8 @@ envlist =
     {py3.6,py3.7}-django-v1.11.29
     {py3.6,py3.8,py3.9}-django-v2.2.28
     {py3.6,py3.9,py3.10}-django-v3.2.25
-    {py3.8,py3.11,py3.12}-django-v4.2.25
-    {py3.10,py3.12,py3.13}-django-v5.2.7
+    {py3.8,py3.11,py3.12}-django-v4.2.26
+    {py3.10,py3.13,py3.14,py3.14t}-django-v5.2.8
     {py3.12,py3.13,py3.14,py3.14t}-django-v6.0b1
 
     {py3.6,py3.7,py3.8}-flask-v1.1.4
@@ -371,35 +371,35 @@ deps =
     cohere-v5.20.0: cohere==5.20.0
 
     google_genai-v1.29.0: google-genai==1.29.0
-    google_genai-v1.35.0: google-genai==1.35.0
-    google_genai-v1.41.0: google-genai==1.41.0
-    google_genai-v1.48.0: google-genai==1.48.0
+    google_genai-v1.36.0: google-genai==1.36.0
+    google_genai-v1.43.0: google-genai==1.43.0
+    google_genai-v1.49.0: google-genai==1.49.0
     google_genai: pytest-asyncio
 
     huggingface_hub-v0.24.7: huggingface_hub==0.24.7
     huggingface_hub-v0.36.0: huggingface_hub==0.36.0
-    huggingface_hub-v1.0.1: huggingface_hub==1.0.1
+    huggingface_hub-v1.1.2: huggingface_hub==1.1.2
     huggingface_hub: responses
     huggingface_hub: pytest-httpx
 
     langchain-base-v0.1.20: langchain==0.1.20
     langchain-base-v0.3.27: langchain==0.3.27
-    langchain-base-v1.0.3: langchain==1.0.3
+    langchain-base-v1.0.4: langchain==1.0.4
     langchain-base: openai
     langchain-base: tiktoken
     langchain-base: langchain-openai
     langchain-base-v0.3.27: langchain-community
-    langchain-base-v1.0.3: langchain-community
-    langchain-base-v1.0.3: langchain-classic
+    langchain-base-v1.0.4: langchain-community
+    langchain-base-v1.0.4: langchain-classic
 
     langchain-notiktoken-v0.1.20: langchain==0.1.20
     langchain-notiktoken-v0.3.27: langchain==0.3.27
-    langchain-notiktoken-v1.0.3: langchain==1.0.3
+    langchain-notiktoken-v1.0.4: langchain==1.0.4
     langchain-notiktoken: openai
     langchain-notiktoken: langchain-openai
     langchain-notiktoken-v0.3.27: langchain-community
-    langchain-notiktoken-v1.0.3: langchain-community
-    langchain-notiktoken-v1.0.3: langchain-classic
+    langchain-notiktoken-v1.0.4: langchain-community
+    langchain-notiktoken-v1.0.4: langchain-classic
 
     langgraph-v0.6.11: langgraph==0.6.11
     langgraph-v1.0.2: langgraph==1.0.2
@@ -411,7 +411,7 @@ deps =
     mcp-v1.15.0: mcp==1.15.0
     mcp-v1.17.0: mcp==1.17.0
     mcp-v1.19.0: mcp==1.19.0
-    mcp-v1.20.0: mcp==1.20.0
+    mcp-v1.21.0: mcp==1.21.0
     mcp: pytest-asyncio
 
     openai-base-v1.0.1: openai==1.0.1
@@ -428,9 +428,9 @@ deps =
     openai-notiktoken-v1.0.1: httpx<0.28
 
     openai_agents-v0.0.19: openai-agents==0.0.19
-    openai_agents-v0.1.0: openai-agents==0.1.0
     openai_agents-v0.2.11: openai-agents==0.2.11
     openai_agents-v0.4.2: openai-agents==0.4.2
+    openai_agents-v0.5.0: openai-agents==0.5.0
     openai_agents: pytest-asyncio
 
     pydantic_ai-v1.0.18: pydantic-ai==1.0.18
@@ -444,7 +444,7 @@ deps =
     boto3-v1.12.49: boto3==1.12.49
     boto3-v1.20.54: boto3==1.20.54
     boto3-v1.28.85: boto3==1.28.85
-    boto3-v1.40.65: boto3==1.40.65
+    boto3-v1.40.68: boto3==1.40.68
     {py3.7,py3.8}-boto3: urllib3<2.0.0
 
     chalice-v1.16.0: chalice==1.16.0
@@ -521,7 +521,7 @@ deps =
     {py3.6}-graphene: aiocontextvars
 
     strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
-    strawberry-v0.284.1: strawberry-graphql[fastapi,flask]==0.284.1
+    strawberry-v0.284.2: strawberry-graphql[fastapi,flask]==0.284.2
     strawberry: httpx
     strawberry-v0.209.8: pydantic<2.11
 
@@ -597,22 +597,22 @@ deps =
     django-v1.11.29: django==1.11.29
     django-v2.2.28: django==2.2.28
     django-v3.2.25: django==3.2.25
-    django-v4.2.25: django==4.2.25
-    django-v5.2.7: django==5.2.7
+    django-v4.2.26: django==4.2.26
+    django-v5.2.8: django==5.2.8
     django-v6.0b1: django==6.0b1
     django: psycopg2-binary
     django: djangorestframework
     django: pytest-django
     django: Werkzeug
     django-v2.2.28: channels[daphne]
     django-v3.2.25: channels[daphne]
-    django-v4.2.25: channels[daphne]
-    django-v5.2.7: channels[daphne]
+    django-v4.2.26: channels[daphne]
+    django-v5.2.8: channels[daphne]
     django-v6.0b1: channels[daphne]
     django-v2.2.28: six
     django-v3.2.25: pytest-asyncio
-    django-v4.2.25: pytest-asyncio
-    django-v5.2.7: pytest-asyncio
+    django-v4.2.26: pytest-asyncio
+    django-v5.2.8: pytest-asyncio
     django-v6.0b1: pytest-asyncio
     django-v1.11.29: djangorestframework>=3.0,<4.0
     django-v1.11.29: Werkzeug<2.1.0
@@ -622,6 +622,7 @@ deps =
     django-v3.2.25: Werkzeug<2.1.0
     django-v1.11.29: pytest-django<4.0
     django-v2.2.28: pytest-django<4.0
+    {py3.14,py3.14t}-django: coverage==7.11.0
 
     flask-v1.1.4: flask==1.1.4
     flask-v2.3.3: flask==2.3.3