Merge branch 'master' into potel-base

Author: sentrivana

requirements-aws-lambda-layer.txt

@@ -1,9 +1,9 @@
 certifi
-
-# In Lambda functions botocore is used, and botocore is not
-# yet supporting urllib3 1.27.0 never mind 2+.
+urllib3
+# In Lambda functions botocore is used, and botocore has
+# restrictions on urllib3
+# https://github.com/boto/botocore/blob/develop/setup.cfg
 # So we pin this here to make our Lambda layer work with
 # Lambda Function using Python 3.7+
-urllib3<1.27
-
+urllib3<1.27; python_version < "3.10"
 opentelemetry-distro>=0.35b0

scripts/generate-test-files.sh

@@ -6,12 +6,13 @@ set -xe
 
 cd "$(dirname "$0")"
 
+rm -rf toxgen.venv
 python -m venv toxgen.venv
 . toxgen.venv/bin/activate
 
-pip install -e ..
-pip install -r populate_tox/requirements.txt
-pip install -r split_tox_gh_actions/requirements.txt
+toxgen.venv/bin/pip install -e ..
+toxgen.venv/bin/pip install -r populate_tox/requirements.txt
+toxgen.venv/bin/pip install -r split_tox_gh_actions/requirements.txt
 
-python populate_tox/populate_tox.py
-python split_tox_gh_actions/split_tox_gh_actions.py
+toxgen.venv/bin/python populate_tox/populate_tox.py
+toxgen.venv/bin/python split_tox_gh_actions/split_tox_gh_actions.py

scripts/populate_tox/populate_tox.py

@@ -10,7 +10,7 @@
 from bisect import bisect_left
 from collections import defaultdict
 from datetime import datetime, timedelta, timezone  # noqa: F401
-from importlib.metadata import metadata
+from importlib.metadata import PackageMetadata, distributions
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 from pathlib import Path
@@ -87,6 +87,13 @@
 }
 
 
+def _fetch_sdk_metadata() -> PackageMetadata:
+    (dist,) = distributions(
+        name="sentry-sdk", path=[Path(__file__).parent.parent.parent]
+    )
+    return dist.metadata
+
+
 def fetch_url(url: str) -> Optional[dict]:
     for attempt in range(3):
         pypi_data = requests.get(url)
@@ -592,8 +599,9 @@ def main(fail_on_changes: bool = False) -> None:
         )
 
     global MIN_PYTHON_VERSION, MAX_PYTHON_VERSION
+    meta = _fetch_sdk_metadata()
     sdk_python_versions = _parse_python_versions_from_classifiers(
-        metadata("sentry-sdk").get_all("Classifier")
+        meta.get_all("Classifier")
     )
     MIN_PYTHON_VERSION = sdk_python_versions[0]
     MAX_PYTHON_VERSION = sdk_python_versions[-1]

tests/integrations/loguru/test_loguru.py

@@ -1,4 +1,5 @@
 from unittest.mock import MagicMock, patch
+import re
 
 import pytest
 from loguru import logger
@@ -56,10 +57,10 @@ def test_just_log(
 
     getattr(logger, level.name.lower())("test")
 
-    formatted_message = (
-        " | "
-        + "{:9}".format(level.name.upper())
-        + "| tests.integrations.loguru.test_loguru:test_just_log:57 - test"
+    expected_pattern = (
+        r" \| "
+        + r"{:9}".format(level.name.upper())
+        + r"\| tests\.integrations\.loguru\.test_loguru:test_just_log:\d+ - test"
     )
 
     if not created_event:
@@ -72,7 +73,7 @@ def test_just_log(
             (breadcrumb,) = breadcrumbs
             assert breadcrumb["level"] == expected_sentry_level
             assert breadcrumb["category"] == "tests.integrations.loguru.test_loguru"
-            assert breadcrumb["message"][23:] == formatted_message
+            assert re.fullmatch(expected_pattern, breadcrumb["message"][23:])
         else:
             assert not breadcrumbs
 
@@ -85,7 +86,7 @@ def test_just_log(
     (event,) = events
     assert event["level"] == expected_sentry_level
     assert event["logger"] == "tests.integrations.loguru.test_loguru"
-    assert event["logentry"]["message"][23:] == formatted_message
+    assert re.fullmatch(expected_pattern, event["logentry"]["message"][23:])
 
 
 def test_breadcrumb_format(sentry_init, capture_events, uninstall_integration, request):

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-06-25T13:33:01.471693+00:00
+# Last generated: 2025-07-08T11:21:36.224017+00:00
 
 [tox]
 requires =
@@ -132,9 +132,9 @@ envlist =
 
     # ~~~ AI ~~~
     {py3.8,py3.11,py3.12}-anthropic-v0.16.0
-    {py3.8,py3.11,py3.12}-anthropic-v0.29.2
-    {py3.8,py3.11,py3.12}-anthropic-v0.42.0
-    {py3.8,py3.11,py3.12}-anthropic-v0.55.0
+    {py3.8,py3.11,py3.12}-anthropic-v0.30.1
+    {py3.8,py3.11,py3.12}-anthropic-v0.44.0
+    {py3.8,py3.11,py3.12}-anthropic-v0.57.1
 
     {py3.9,py3.10,py3.11}-cohere-v5.4.0
     {py3.9,py3.11,py3.12}-cohere-v5.8.1
@@ -144,7 +144,7 @@ envlist =
     {py3.8,py3.10,py3.11}-huggingface_hub-v0.22.2
     {py3.8,py3.11,py3.12}-huggingface_hub-v0.26.5
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.30.2
-    {py3.8,py3.12,py3.13}-huggingface_hub-v0.33.1
+    {py3.8,py3.12,py3.13}-huggingface_hub-v0.33.2
 
 
     # ~~~ DBs ~~~
@@ -179,7 +179,8 @@ envlist =
 
     {py3.8,py3.12,py3.13}-unleash-v6.0.1
     {py3.8,py3.12,py3.13}-unleash-v6.1.0
-    {py3.8,py3.12,py3.13}-unleash-v6.2.1
+    {py3.8,py3.12,py3.13}-unleash-v6.2.2
+    {py3.8,py3.12,py3.13}-unleash-v6.3.0
 
 
     # ~~~ GraphQL ~~~
@@ -198,14 +199,14 @@ envlist =
     {py3.8,py3.10,py3.11}-strawberry-v0.209.8
     {py3.8,py3.11,py3.12}-strawberry-v0.231.1
     {py3.8,py3.12,py3.13}-strawberry-v0.253.1
-    {py3.9,py3.12,py3.13}-strawberry-v0.275.2
+    {py3.9,py3.12,py3.13}-strawberry-v0.275.5
 
 
     # ~~~ Network ~~~
     {py3.7,py3.8}-grpc-v1.32.0
     {py3.7,py3.9,py3.10}-grpc-v1.46.5
     {py3.7,py3.11,py3.12}-grpc-v1.60.2
-    {py3.9,py3.12,py3.13}-grpc-v1.73.0
+    {py3.9,py3.12,py3.13}-grpc-v1.73.1
 
 
     # ~~~ Tasks ~~~
@@ -234,7 +235,7 @@ envlist =
     {py3.7,py3.9,py3.10}-django-v3.2.25
     {py3.8,py3.11,py3.12}-django-v4.2.23
     {py3.10,py3.11,py3.12}-django-v5.0.14
-    {py3.10,py3.12,py3.13}-django-v5.2.3
+    {py3.10,py3.12,py3.13}-django-v5.2.4
 
     {py3.7,py3.8}-flask-v1.1.4
     {py3.8,py3.12,py3.13}-flask-v2.3.3
@@ -249,7 +250,7 @@ envlist =
     {py3.7,py3.9,py3.10}-fastapi-v0.79.1
     {py3.7,py3.10,py3.11}-fastapi-v0.91.0
     {py3.7,py3.10,py3.11}-fastapi-v0.103.2
-    {py3.8,py3.12,py3.13}-fastapi-v0.115.13
+    {py3.8,py3.12,py3.13}-fastapi-v0.116.0
 
 
     # ~~~ Web 2 ~~~
@@ -290,8 +291,8 @@ envlist =
     {py3.7}-trytond-v5.0.63
     {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.32
-    {py3.9,py3.12,py3.13}-trytond-v7.6.2
+    {py3.8,py3.11,py3.12}-trytond-v7.0.33
+    {py3.9,py3.12,py3.13}-trytond-v7.6.3
 
     {py3.7,py3.12,py3.13}-typer-v0.15.4
     {py3.7,py3.12,py3.13}-typer-v0.16.0
@@ -488,13 +489,13 @@ deps =
 
     # ~~~ AI ~~~
     anthropic-v0.16.0: anthropic==0.16.0
-    anthropic-v0.29.2: anthropic==0.29.2
-    anthropic-v0.42.0: anthropic==0.42.0
-    anthropic-v0.55.0: anthropic==0.55.0
+    anthropic-v0.30.1: anthropic==0.30.1
+    anthropic-v0.44.0: anthropic==0.44.0
+    anthropic-v0.57.1: anthropic==0.57.1
     anthropic: pytest-asyncio
     anthropic-v0.16.0: httpx<0.28.0
-    anthropic-v0.29.2: httpx<0.28.0
-    anthropic-v0.42.0: httpx<0.28.0
+    anthropic-v0.30.1: httpx<0.28.0
+    anthropic-v0.44.0: httpx<0.28.0
 
     cohere-v5.4.0: cohere==5.4.0
     cohere-v5.8.1: cohere==5.8.1
@@ -504,7 +505,7 @@ deps =
     huggingface_hub-v0.22.2: huggingface_hub==0.22.2
     huggingface_hub-v0.26.5: huggingface_hub==0.26.5
     huggingface_hub-v0.30.2: huggingface_hub==0.30.2
-    huggingface_hub-v0.33.1: huggingface_hub==0.33.1
+    huggingface_hub-v0.33.2: huggingface_hub==0.33.2
 
 
     # ~~~ DBs ~~~
@@ -541,7 +542,8 @@ deps =
 
     unleash-v6.0.1: UnleashClient==6.0.1
     unleash-v6.1.0: UnleashClient==6.1.0
-    unleash-v6.2.1: UnleashClient==6.2.1
+    unleash-v6.2.2: UnleashClient==6.2.2
+    unleash-v6.3.0: UnleashClient==6.3.0
 
 
     # ~~~ GraphQL ~~~
@@ -568,7 +570,7 @@ deps =
     strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
     strawberry-v0.231.1: strawberry-graphql[fastapi,flask]==0.231.1
     strawberry-v0.253.1: strawberry-graphql[fastapi,flask]==0.253.1
-    strawberry-v0.275.2: strawberry-graphql[fastapi,flask]==0.275.2
+    strawberry-v0.275.5: strawberry-graphql[fastapi,flask]==0.275.5
     strawberry: httpx
     strawberry-v0.209.8: pydantic<2.11
     strawberry-v0.231.1: pydantic<2.11
@@ -579,7 +581,7 @@ deps =
     grpc-v1.32.0: grpcio==1.32.0
     grpc-v1.46.5: grpcio==1.46.5
     grpc-v1.60.2: grpcio==1.60.2
-    grpc-v1.73.0: grpcio==1.73.0
+    grpc-v1.73.1: grpcio==1.73.1
     grpc: protobuf
     grpc: mypy-protobuf
     grpc: types-protobuf
@@ -614,7 +616,7 @@ deps =
     django-v3.2.25: django==3.2.25
     django-v4.2.23: django==4.2.23
     django-v5.0.14: django==5.0.14
-    django-v5.2.3: django==5.2.3
+    django-v5.2.4: django==5.2.4
     django: channels[daphne]
     django: psycopg2-binary
     django: djangorestframework
@@ -625,12 +627,12 @@ deps =
     django-v3.2.25: channels[daphne]
     django-v4.2.23: channels[daphne]
     django-v5.0.14: channels[daphne]
-    django-v5.2.3: channels[daphne]
+    django-v5.2.4: channels[daphne]
     django-v2.2.28: six
     django-v3.2.25: pytest-asyncio
     django-v4.2.23: pytest-asyncio
     django-v5.0.14: pytest-asyncio
-    django-v5.2.3: pytest-asyncio
+    django-v5.2.4: pytest-asyncio
     django-v2.0.13: djangorestframework>=3.0,<4.0
     django-v2.0.13: Werkzeug<2.1.0
     django-v2.2.28: djangorestframework>=3.0,<4.0
@@ -667,7 +669,7 @@ deps =
     fastapi-v0.79.1: fastapi==0.79.1
     fastapi-v0.91.0: fastapi==0.91.0
     fastapi-v0.103.2: fastapi==0.103.2
-    fastapi-v0.115.13: fastapi==0.115.13
+    fastapi-v0.116.0: fastapi==0.116.0
     fastapi: httpx
     fastapi: pytest-asyncio
     fastapi: python-multipart
@@ -738,8 +740,8 @@ deps =
     trytond-v5.0.63: trytond==5.0.63
     trytond-v5.8.16: trytond==5.8.16
     trytond-v6.8.17: trytond==6.8.17
-    trytond-v7.0.32: trytond==7.0.32
-    trytond-v7.6.2: trytond==7.6.2
+    trytond-v7.0.33: trytond==7.0.33
+    trytond-v7.6.3: trytond==7.6.3
     trytond: werkzeug
     trytond-v5.0.63: werkzeug<1.0