Merge remote-tracking branch 'origin/master' into potel-base

Author: sl0thentr0py

.github/workflows/test-integrations-tasks.yml

@@ -39,6 +39,11 @@ jobs:
           allow-prereleases: true
       - name: Start Redis
         uses: supercharge/redis-github-action@1.8.0
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox
@@ -115,6 +120,11 @@ jobs:
           allow-prereleases: true
       - name: Start Redis
         uses: supercharge/redis-github-action@1.8.0
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox

.gitignore

@@ -29,6 +29,7 @@ relay
 pip-wheel-metadata
 .mypy_cache
 .vscode/
+toxgen.venv
 
 # for running AWS Lambda tests using AWS SAM
 sam.template.yaml

scripts/populate_tox/config.py

@@ -71,8 +71,9 @@
                 "pytest-django",
                 "Werkzeug",
             ],
-            ">=3.0": ["pytest-asyncio"],
+            ">=2.0": ["channels[daphne]"],
             ">=2.2,<3.1": ["six"],
+            ">=3.0": ["pytest-asyncio"],
             "<3.3": [
                 "djangorestframework>=3.0,<4.0",
                 "Werkzeug<2.1.0",

scripts/populate_tox/tox.jinja

@@ -152,6 +152,7 @@ deps =
     # for justification of the upper bound on pytest
     py3.7-gevent: pytest<7.0.0
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
+    gevent: pytest-asyncio
 
     # === Integrations ===
 
@@ -332,6 +333,7 @@ setenv =
 
     django: DJANGO_SETTINGS_MODULE=tests.integrations.django.myapp.settings
     py3.12-django: PIP_CONSTRAINT=constraints.txt
+    spark-v{3.0.3,3.5.6}: JAVA_HOME=/usr/lib/jvm/temurin-11-jdk-amd64
 
     common: TESTPATH=tests
     gevent: TESTPATH=tests

scripts/split_tox_gh_actions/split_tox_gh_actions.py

@@ -47,6 +47,10 @@
     "aws_lambda",
 }
 
+FRAMEWORKS_NEEDING_JAVA = {
+    "spark",
+}
+
 # Frameworks grouped here will be tested together to not hog all GitHub runners.
 # If you add or remove a group, make sure to git rm the generated YAML file as
 # well.
@@ -288,6 +292,7 @@ def render_template(group, frameworks, py_versions_pinned, py_versions_latest):
         "needs_docker": bool(set(frameworks) & FRAMEWORKS_NEEDING_DOCKER),
         "needs_postgres": bool(set(frameworks) & FRAMEWORKS_NEEDING_POSTGRES),
         "needs_redis": bool(set(frameworks) & FRAMEWORKS_NEEDING_REDIS),
+        "needs_java": bool(set(frameworks) & FRAMEWORKS_NEEDING_JAVA),
         "py_versions": {
             category: [f'"{version}"' for version in _normalize_py_versions(versions)]
             for category, versions in py_versions.items()

scripts/split_tox_gh_actions/templates/test_group.jinja

@@ -41,6 +41,7 @@
         with:
           python-version: {% raw %}${{ matrix.python-version }}{% endraw %}
           allow-prereleases: true
+
       {% if needs_clickhouse %}
       - name: "Setup ClickHouse Server"
         uses: getsentry/action-clickhouse-in-ci@v1.6
@@ -51,6 +52,14 @@
         uses: supercharge/redis-github-action@1.8.0
       {% endif %}
 
+      {% if needs_java %}
+      - name: Install Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      {% endif %}
+
       - name: Setup Test Env
         run: |
           pip install "coverage[toml]" tox

tests/integrations/django/asgi/test_asgi.py

@@ -30,6 +30,9 @@
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.asyncio
 @pytest.mark.forked
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
 async def test_basic(sentry_init, capture_events, application):
     sentry_init(
         integrations=[DjangoIntegration()],
@@ -575,6 +578,9 @@ async def test_asgi_request_body(
         "asyncio.iscoroutinefunction has been replaced in 3.12 by inspect.iscoroutinefunction"
     ),
 )
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
 async def test_asgi_mixin_iscoroutinefunction_before_3_12():
     sentry_asgi_mixin = _asgi_middleware_mixin_factory(lambda: None)
 
@@ -632,6 +638,9 @@ def get_response(): ...
 
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
+)
 async def test_async_view(sentry_init, capture_events, application):
     sentry_init(
         integrations=[DjangoIntegration()],
@@ -651,6 +660,9 @@ async def test_async_view(sentry_init, capture_events, application):
 
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
 async def test_transaction_http_method_default(
     sentry_init, capture_events, application
 ):
@@ -688,6 +700,9 @@ async def test_transaction_http_method_default(
 
 @pytest.mark.parametrize("application", APPS)
 @pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
 async def test_transaction_http_method_custom(sentry_init, capture_events, application):
     sentry_init(
         integrations=[

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-02T10:27:12.681988+00:00
+# Last generated: 2025-06-04T11:51:35.459320+00:00
 
 [tox]
 requires =
@@ -134,7 +134,7 @@ envlist =
     {py3.8,py3.11,py3.12}-anthropic-v0.16.0
     {py3.8,py3.11,py3.12}-anthropic-v0.28.1
     {py3.8,py3.11,py3.12}-anthropic-v0.40.0
-    {py3.8,py3.11,py3.12}-anthropic-v0.52.1
+    {py3.8,py3.11,py3.12}-anthropic-v0.52.2
 
     {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.10,py3.11}-huggingface_hub-v0.25.2
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.28.1
-    {py3.8,py3.12,py3.13}-huggingface_hub-v0.32.3
+    {py3.8,py3.12,py3.13}-huggingface_hub-v0.32.4
 
 
     # ~~~ DBs ~~~
@@ -257,8 +257,7 @@ envlist =
     {py3.7}-aiohttp-v3.4.4
     {py3.7,py3.8,py3.9}-aiohttp-v3.7.4
     {py3.8,py3.12,py3.13}-aiohttp-v3.10.11
-    {py3.9,py3.12,py3.13}-aiohttp-v3.12.6
-    {py3.9,py3.12,py3.13}-aiohttp-v3.12.7rc0
+    {py3.9,py3.12,py3.13}-aiohttp-v3.12.8
 
     {py3.7}-bottle-v0.12.25
     {py3.8,py3.12,py3.13}-bottle-v0.13.3
@@ -318,6 +317,7 @@ deps =
     # for justification of the upper bound on pytest
     py3.7-gevent: pytest<7.0.0
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
+    gevent: pytest-asyncio
 
     # === Integrations ===
 
@@ -488,7 +488,7 @@ deps =
     anthropic-v0.16.0: anthropic==0.16.0
     anthropic-v0.28.1: anthropic==0.28.1
     anthropic-v0.40.0: anthropic==0.40.0
-    anthropic-v0.52.1: anthropic==0.52.1
+    anthropic-v0.52.2: anthropic==0.52.2
     anthropic: pytest-asyncio
     anthropic-v0.16.0: httpx<0.28.0
     anthropic-v0.28.1: httpx<0.28.0
@@ -502,7 +502,7 @@ deps =
     huggingface_hub-v0.22.2: huggingface_hub==0.22.2
     huggingface_hub-v0.25.2: huggingface_hub==0.25.2
     huggingface_hub-v0.28.1: huggingface_hub==0.28.1
-    huggingface_hub-v0.32.3: huggingface_hub==0.32.3
+    huggingface_hub-v0.32.4: huggingface_hub==0.32.4
 
 
     # ~~~ DBs ~~~
@@ -619,11 +619,17 @@ deps =
     django: djangorestframework
     django: pytest-django
     django: Werkzeug
+    django-v2.0.13: channels[daphne]
+    django-v2.2.28: channels[daphne]
+    django-v3.2.25: channels[daphne]
+    django-v4.2.21: channels[daphne]
+    django-v5.0.14: channels[daphne]
+    django-v5.2.1: channels[daphne]
+    django-v2.2.28: six
     django-v3.2.25: pytest-asyncio
     django-v4.2.21: pytest-asyncio
     django-v5.0.14: pytest-asyncio
     django-v5.2.1: pytest-asyncio
-    django-v2.2.28: six
     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
@@ -676,11 +682,10 @@ deps =
     aiohttp-v3.4.4: aiohttp==3.4.4
     aiohttp-v3.7.4: aiohttp==3.7.4
     aiohttp-v3.10.11: aiohttp==3.10.11
-    aiohttp-v3.12.6: aiohttp==3.12.6
-    aiohttp-v3.12.7rc0: aiohttp==3.12.7rc0
+    aiohttp-v3.12.8: aiohttp==3.12.8
     aiohttp: pytest-aiohttp
     aiohttp-v3.10.11: pytest-asyncio
-    aiohttp-v3.12.6: pytest-asyncio
+    aiohttp-v3.12.8: pytest-asyncio
 
     bottle-v0.12.25: bottle==0.12.25
     bottle-v0.13.3: bottle==0.13.3
@@ -749,6 +754,7 @@ setenv =
 
     django: DJANGO_SETTINGS_MODULE=tests.integrations.django.myapp.settings
     py3.12-django: PIP_CONSTRAINT=constraints.txt
+    spark-v{3.0.3,3.5.6}: JAVA_HOME=/usr/lib/jvm/temurin-11-jdk-amd64
 
     common: TESTPATH=tests
     gevent: TESTPATH=tests