tests: Regenerate tox.ini & fix CI

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

@@ -46,6 +46,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
@@ -135,6 +140,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

scripts/populate_tox/config.py

@@ -58,14 +58,14 @@
                 "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",
             ],
             "<3.1": ["pytest-django<4.0"],
-            ">=2.0": ["channels[daphne]"],
         },
     },
     "dramatiq": {

scripts/populate_tox/tox.jinja

@@ -172,6 +172,7 @@ deps =
     # for justification of the upper bound on pytest
     {py3.6,py3.7}-gevent: pytest<7.0.0
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
+    gevent: pytest-asyncio
 
     # === Integrations ===
 
@@ -362,6 +363,7 @@ setenv =
     py3.6: COVERAGE_RCFILE=.coveragerc36
 
     django: DJANGO_SETTINGS_MODULE=tests.integrations.django.myapp.settings
+    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

@@ -48,6 +48,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
@@ -58,6 +59,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()],
@@ -579,6 +582,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)
 
@@ -636,6 +642,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()],
@@ -655,6 +664,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
 ):
@@ -687,6 +699,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=[