From 3a4e8bfc50709b1074fc71bf099e669d18bf6ae1 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Wed, 4 Sep 2024 17:22:54 +0200
Subject: [PATCH 01/14] Maybe better coverage config

---
 .github/workflows/test-integrations-ai.yml               | 8 ++++----
 .github/workflows/test-integrations-aws-lambda.yml       | 4 ++--
 .github/workflows/test-integrations-cloud-computing.yml  | 8 ++++----
 .github/workflows/test-integrations-common.yml           | 4 ++--
 .github/workflows/test-integrations-data-processing.yml  | 8 ++++----
 .github/workflows/test-integrations-databases.yml        | 8 ++++----
 .github/workflows/test-integrations-graphql.yml          | 8 ++++----
 .github/workflows/test-integrations-miscellaneous.yml    | 8 ++++----
 .github/workflows/test-integrations-networking.yml       | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-1.yml | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-2.yml | 8 ++++----
 scripts/split-tox-gh-actions/templates/test_group.jinja  | 4 ++--
 tox.ini                                                  | 2 +-
 13 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
index b3d96dfab3..79f61358ad 100644
--- a/.github/workflows/test-integrations-ai.yml
+++ b/.github/workflows/test-integrations-ai.yml
@@ -68,8 +68,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -130,8 +130,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
index daab40a91d..ecc3693758 100644
--- a/.github/workflows/test-integrations-aws-lambda.yml
+++ b/.github/workflows/test-integrations-aws-lambda.yml
@@ -87,8 +87,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
index 86ecab6f8e..21da86ae48 100644
--- a/.github/workflows/test-integrations-cloud-computing.yml
+++ b/.github/workflows/test-integrations-cloud-computing.yml
@@ -64,8 +64,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -122,8 +122,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
index 52baefd5b1..70d6edffd3 100644
--- a/.github/workflows/test-integrations-common.yml
+++ b/.github/workflows/test-integrations-common.yml
@@ -52,8 +52,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
index 97fd913c44..841d153592 100644
--- a/.github/workflows/test-integrations-data-processing.yml
+++ b/.github/workflows/test-integrations-data-processing.yml
@@ -82,8 +82,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -158,8 +158,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
index d740912829..0d47b36a24 100644
--- a/.github/workflows/test-integrations-databases.yml
+++ b/.github/workflows/test-integrations-databases.yml
@@ -91,8 +91,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -176,8 +176,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
index 6a499fa355..b09a6e90c8 100644
--- a/.github/workflows/test-integrations-graphql.yml
+++ b/.github/workflows/test-integrations-graphql.yml
@@ -64,8 +64,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -122,8 +122,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
index f5148fb2c8..ea79d49e79 100644
--- a/.github/workflows/test-integrations-miscellaneous.yml
+++ b/.github/workflows/test-integrations-miscellaneous.yml
@@ -68,8 +68,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -130,8 +130,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
index 6a55ffadd8..a6254cbfb7 100644
--- a/.github/workflows/test-integrations-networking.yml
+++ b/.github/workflows/test-integrations-networking.yml
@@ -64,8 +64,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -122,8 +122,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
index 246248a700..ff41051e40 100644
--- a/.github/workflows/test-integrations-web-frameworks-1.yml
+++ b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -82,8 +82,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -158,8 +158,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
index cfc03a935a..75e38e498e 100644
--- a/.github/workflows/test-integrations-web-frameworks-2.yml
+++ b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -88,8 +88,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
@@ -170,8 +170,8 @@ jobs:
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v4.5.0
diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index 43d7081446..408db75bd7 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -80,8 +80,8 @@
       - name: Generate coverage XML
         if: {% raw %}${{ !cancelled() }}{% endraw %}
         run: |
-          coverage combine .coverage*
-          coverage xml -i
+          coverage combine .coverage-sentry-*
+          coverage xml
 
       - name: Upload coverage to Codecov
         if: {% raw %}${{ !cancelled() }}{% endraw %}
diff --git a/tox.ini b/tox.ini
index dd1dbf1156..47b3db753d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -683,7 +683,7 @@ deps =
 setenv =
     PYTHONDONTWRITEBYTECODE=1
     OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
-    COVERAGE_FILE=.coverage-{envname}
+    COVERAGE_FILE=.coverage-sentry-{envname}
     django: DJANGO_SETTINGS_MODULE=tests.integrations.django.myapp.settings
 
     common: TESTPATH=tests

From ba285e08507982bc908014dcaa0e5f0f190d5de0 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Wed, 4 Sep 2024 17:38:28 +0200
Subject: [PATCH 02/14] only take current dir (nothing in /tmp) at least I hope
 so

---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index bece12f986..c03752b039 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts = -vvv -rfEs -s --durations=5 --cov=tests --cov=sentry_sdk --cov-branch --cov-report= --tb=short --junitxml=.junitxml
+addopts = -vvv -rfEs -s --durations=5 --cov=./sentry_sdk --cov-branch --cov-report= --tb=short --junitxml=.junitxml
 asyncio_mode = strict
 markers = 
     tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)

From 5f90f0ae08039bb03b41cbac703057fa385bc417 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 09:35:27 +0200
Subject: [PATCH 03/14] ommitting some directories

---
 pyproject.toml | 15 ++++++++++++---
 pytest.ini     |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index a2d2e0f7d0..7823c17a7e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,16 @@ extend-exclude = '''
     | .*_pb2_grpc.py  # exclude autogenerated Protocol Buffer files anywhere in the project
 )
 '''
+
+[tool.coverage.run]
+branch = true
+omit = [
+    "/tmp/*",
+    "*/tests/*",
+    "*/.venv/*",
+]
+
 [tool.coverage.report]
-    exclude_also = [
-        "if TYPE_CHECKING:",
-    ]
\ No newline at end of file
+exclude_also = [
+    "if TYPE_CHECKING:",
+]
\ No newline at end of file
diff --git a/pytest.ini b/pytest.ini
index c03752b039..473b461222 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts = -vvv -rfEs -s --durations=5 --cov=./sentry_sdk --cov-branch --cov-report= --tb=short --junitxml=.junitxml
+addopts = -vvv -rfEs -s --durations=5 --cov=./sentry_sdk --cov-report= --tb=short --junitxml=.junitxml
 asyncio_mode = strict
 markers = 
     tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)

From 4008ad08fbf3d858ea33b792f8d9dff401fc39f0 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 10:24:11 +0200
Subject: [PATCH 04/14] Ignore errors only in old python

---
 .github/workflows/test-integrations-ai.yml     | 18 ++++++++++++++----
 .../workflows/test-integrations-aws-lambda.yml |  9 +++++++--
 .../test-integrations-cloud-computing.yml      | 18 ++++++++++++++----
 .github/workflows/test-integrations-common.yml |  9 +++++++--
 .../test-integrations-data-processing.yml      | 18 ++++++++++++++----
 .../workflows/test-integrations-databases.yml  | 18 ++++++++++++++----
 .../workflows/test-integrations-graphql.yml    | 18 ++++++++++++++----
 .../test-integrations-miscellaneous.yml        | 18 ++++++++++++++----
 .../workflows/test-integrations-networking.yml | 18 ++++++++++++++----
 .../test-integrations-web-frameworks-1.yml     | 18 ++++++++++++++----
 .../test-integrations-web-frameworks-2.yml     | 18 ++++++++++++++----
 pytest.ini                                     |  2 +-
 .../templates/test_group.jinja                 | 10 ++++++++--
 13 files changed, 149 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
index 79f61358ad..594894f932 100644
--- a/.github/workflows/test-integrations-ai.yml
+++ b/.github/workflows/test-integrations-ai.yml
@@ -65,8 +65,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -127,8 +132,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
index ecc3693758..d1a9bbe561 100644
--- a/.github/workflows/test-integrations-aws-lambda.yml
+++ b/.github/workflows/test-integrations-aws-lambda.yml
@@ -84,8 +84,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
index 21da86ae48..d5c0dfe64a 100644
--- a/.github/workflows/test-integrations-cloud-computing.yml
+++ b/.github/workflows/test-integrations-cloud-computing.yml
@@ -61,8 +61,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -119,8 +124,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gcp"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
index 70d6edffd3..a721b4c4c7 100644
--- a/.github/workflows/test-integrations-common.yml
+++ b/.github/workflows/test-integrations-common.yml
@@ -49,8 +49,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-common"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
index 841d153592..6dd7c1aec5 100644
--- a/.github/workflows/test-integrations-data-processing.yml
+++ b/.github/workflows/test-integrations-data-processing.yml
@@ -79,8 +79,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -155,8 +160,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
index 0d47b36a24..5cb504d389 100644
--- a/.github/workflows/test-integrations-databases.yml
+++ b/.github/workflows/test-integrations-databases.yml
@@ -88,8 +88,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -173,8 +178,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-sqlalchemy"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
index b09a6e90c8..9b794e5a83 100644
--- a/.github/workflows/test-integrations-graphql.yml
+++ b/.github/workflows/test-integrations-graphql.yml
@@ -61,8 +61,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -119,8 +124,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-strawberry"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
index ea79d49e79..377f719052 100644
--- a/.github/workflows/test-integrations-miscellaneous.yml
+++ b/.github/workflows/test-integrations-miscellaneous.yml
@@ -65,8 +65,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-trytond-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -127,8 +132,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-trytond"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
index a6254cbfb7..cf9aec0abd 100644
--- a/.github/workflows/test-integrations-networking.yml
+++ b/.github/workflows/test-integrations-networking.yml
@@ -61,8 +61,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-requests-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -119,8 +124,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-requests"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
index ff41051e40..38261658a1 100644
--- a/.github/workflows/test-integrations-web-frameworks-1.yml
+++ b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -79,8 +79,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-fastapi-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -155,8 +160,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-fastapi"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
index 75e38e498e..2bbbbfacec 100644
--- a/.github/workflows/test-integrations-web-frameworks-2.yml
+++ b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -85,8 +85,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-tornado-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -167,8 +172,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-tornado"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
+      - name: Generate coverage XML (old python)
+        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+      - name: Generate coverage XML (new pythons)
+        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/pytest.ini b/pytest.ini
index 473b461222..c03752b039 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts = -vvv -rfEs -s --durations=5 --cov=./sentry_sdk --cov-report= --tb=short --junitxml=.junitxml
+addopts = -vvv -rfEs -s --durations=5 --cov=./sentry_sdk --cov-branch --cov-report= --tb=short --junitxml=.junitxml
 asyncio_mode = strict
 markers = 
     tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)
diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index 408db75bd7..a479504e03 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -77,8 +77,14 @@
           {% endif %}
       {% endfor %}
 
-      - name: Generate coverage XML
-        if: {% raw %}${{ !cancelled() }}{% endraw %}
+      - name: Generate coverage XML (old python)
+        if: {% raw %}${{ !cancelled() }}{% endraw %} && matrix.python-version == 'py3.6'
+        run: |
+          coverage combine .coverage-sentry-*
+          coverage xml --ignore-errors
+
+      - name: Generate coverage XML (new pythons)
+        if: {% raw %}${{ !cancelled() }}{% endraw %} && matrix.python-version != 'py3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml

From 81b1f38d5bfe89798fe403d4b31707a44aa23cf7 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 10:27:53 +0200
Subject: [PATCH 05/14] Debug output

---
 .github/workflows/test-integrations-ai.yml       | 16 ++++++++--------
 .../workflows/test-integrations-aws-lambda.yml   |  8 ++++----
 .../test-integrations-cloud-computing.yml        | 16 ++++++++--------
 .github/workflows/test-integrations-common.yml   |  8 ++++----
 .../test-integrations-data-processing.yml        | 16 ++++++++--------
 .../workflows/test-integrations-databases.yml    | 16 ++++++++--------
 .github/workflows/test-integrations-graphql.yml  | 16 ++++++++--------
 .../test-integrations-miscellaneous.yml          | 16 ++++++++--------
 .../workflows/test-integrations-networking.yml   | 16 ++++++++--------
 .../test-integrations-web-frameworks-1.yml       | 16 ++++++++--------
 .../test-integrations-web-frameworks-2.yml       | 16 ++++++++--------
 .../templates/test_group.jinja                   |  8 ++++----
 12 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
index 594894f932..07654da3de 100644
--- a/.github/workflows/test-integrations-ai.yml
+++ b/.github/workflows/test-integrations-ai.yml
@@ -65,13 +65,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -132,13 +132,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
index d1a9bbe561..6c422680b8 100644
--- a/.github/workflows/test-integrations-aws-lambda.yml
+++ b/.github/workflows/test-integrations-aws-lambda.yml
@@ -84,13 +84,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
index d5c0dfe64a..d8f1888596 100644
--- a/.github/workflows/test-integrations-cloud-computing.yml
+++ b/.github/workflows/test-integrations-cloud-computing.yml
@@ -61,13 +61,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -124,13 +124,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gcp"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
index a721b4c4c7..1ea0b99fc2 100644
--- a/.github/workflows/test-integrations-common.yml
+++ b/.github/workflows/test-integrations-common.yml
@@ -49,13 +49,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-common"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
index 6dd7c1aec5..455e2960c7 100644
--- a/.github/workflows/test-integrations-data-processing.yml
+++ b/.github/workflows/test-integrations-data-processing.yml
@@ -79,13 +79,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -160,13 +160,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
index 5cb504d389..46919f828f 100644
--- a/.github/workflows/test-integrations-databases.yml
+++ b/.github/workflows/test-integrations-databases.yml
@@ -88,13 +88,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -178,13 +178,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-sqlalchemy"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
index 9b794e5a83..8cacbcebbd 100644
--- a/.github/workflows/test-integrations-graphql.yml
+++ b/.github/workflows/test-integrations-graphql.yml
@@ -61,13 +61,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -124,13 +124,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-strawberry"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
index 377f719052..0f41af99c6 100644
--- a/.github/workflows/test-integrations-miscellaneous.yml
+++ b/.github/workflows/test-integrations-miscellaneous.yml
@@ -65,13 +65,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-trytond-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -132,13 +132,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-trytond"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
index cf9aec0abd..f91a695c86 100644
--- a/.github/workflows/test-integrations-networking.yml
+++ b/.github/workflows/test-integrations-networking.yml
@@ -61,13 +61,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-requests-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -124,13 +124,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-requests"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
index 38261658a1..66cdd1d335 100644
--- a/.github/workflows/test-integrations-web-frameworks-1.yml
+++ b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -79,13 +79,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-fastapi-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -160,13 +160,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-fastapi"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
index 2bbbbfacec..d52a17926d 100644
--- a/.github/workflows/test-integrations-web-frameworks-2.yml
+++ b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -85,13 +85,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-tornado-latest"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -172,13 +172,13 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-tornado"
-      - name: Generate coverage XML (old python)
-        if: ${{ !cancelled() }} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons)
-        if: ${{ !cancelled() }} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index a479504e03..087767f0a7 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -77,14 +77,14 @@
           {% endif %}
       {% endfor %}
 
-      - name: Generate coverage XML (old python)
-        if: {% raw %}${{ !cancelled() }}{% endraw %} && matrix.python-version == 'py3.6'
+      - name: Generate coverage XML (old python  {% raw %}${{ matrix.python-version }}{% endraw %})
+        if: {% raw %}${{ !cancelled() }}{% endraw %} && matrix.python-version == '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
 
-      - name: Generate coverage XML (new pythons)
-        if: {% raw %}${{ !cancelled() }}{% endraw %} && matrix.python-version != 'py3.6'
+      - name: Generate coverage XML (new pythons  {% raw %}${{ matrix.python-version }}{% endraw %})
+        if: {% raw %}${{ !cancelled() }}{% endraw %} && matrix.python-version != '3.6'
         run: |
           coverage combine .coverage-sentry-*
           coverage xml

From acff62eaa7ff2cfc787cd3557ed0fb267cf078e4 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 10:30:34 +0200
Subject: [PATCH 06/14] thing

---
 scripts/split-tox-gh-actions/templates/test_group.jinja | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index 087767f0a7..a33894b8c2 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -78,13 +78,13 @@
       {% endfor %}
 
       - name: Generate coverage XML (old python  {% raw %}${{ matrix.python-version }}{% endraw %})
-        if: {% raw %}${{ !cancelled() }}{% endraw %} && matrix.python-version == '3.6'
+        if: {% raw %}${{ !cancelled() }} && matrix.python-version == '3.6'{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
 
       - name: Generate coverage XML (new pythons  {% raw %}${{ matrix.python-version }}{% endraw %})
-        if: {% raw %}${{ !cancelled() }}{% endraw %} && matrix.python-version != '3.6'
+        if: {% raw %}${{ !cancelled() }} && matrix.python-version != '3.6'{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml

From 1808bbb43c3734a81efbb9728d022fe48894e603 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 10:37:10 +0200
Subject: [PATCH 07/14] stuff

---
 scripts/split-tox-gh-actions/templates/test_group.jinja | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index a33894b8c2..09dcb47bc4 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -78,13 +78,13 @@
       {% endfor %}
 
       - name: Generate coverage XML (old python  {% raw %}${{ matrix.python-version }}{% endraw %})
-        if: {% raw %}${{ !cancelled() }} && matrix.python-version == '3.6'{% endraw %} 
+        if: {% raw %}${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6'{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
 
       - name: Generate coverage XML (new pythons  {% raw %}${{ matrix.python-version }}{% endraw %})
-        if: {% raw %}${{ !cancelled() }} && matrix.python-version != '3.6'{% endraw %} 
+        if: {% raw %}${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6'{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml

From 50606330f8290b2e91f154b9d6543f036f632e1a Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 10:37:24 +0200
Subject: [PATCH 08/14] stuff

---
 .github/workflows/test-integrations-ai.yml               | 8 ++++----
 .github/workflows/test-integrations-aws-lambda.yml       | 4 ++--
 .github/workflows/test-integrations-cloud-computing.yml  | 8 ++++----
 .github/workflows/test-integrations-common.yml           | 4 ++--
 .github/workflows/test-integrations-data-processing.yml  | 8 ++++----
 .github/workflows/test-integrations-databases.yml        | 8 ++++----
 .github/workflows/test-integrations-graphql.yml          | 8 ++++----
 .github/workflows/test-integrations-miscellaneous.yml    | 8 ++++----
 .github/workflows/test-integrations-networking.yml       | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-1.yml | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-2.yml | 8 ++++----
 11 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
index 07654da3de..b11ce17fc3 100644
--- a/.github/workflows/test-integrations-ai.yml
+++ b/.github/workflows/test-integrations-ai.yml
@@ -66,12 +66,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -133,12 +133,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
index 6c422680b8..a71231df20 100644
--- a/.github/workflows/test-integrations-aws-lambda.yml
+++ b/.github/workflows/test-integrations-aws-lambda.yml
@@ -85,12 +85,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
index d8f1888596..6394d4be3a 100644
--- a/.github/workflows/test-integrations-cloud-computing.yml
+++ b/.github/workflows/test-integrations-cloud-computing.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gcp"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
index 1ea0b99fc2..4329b4c79a 100644
--- a/.github/workflows/test-integrations-common.yml
+++ b/.github/workflows/test-integrations-common.yml
@@ -50,12 +50,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-common"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
index 455e2960c7..8f5ffe1ffa 100644
--- a/.github/workflows/test-integrations-data-processing.yml
+++ b/.github/workflows/test-integrations-data-processing.yml
@@ -80,12 +80,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -161,12 +161,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
index 46919f828f..168507efc9 100644
--- a/.github/workflows/test-integrations-databases.yml
+++ b/.github/workflows/test-integrations-databases.yml
@@ -89,12 +89,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -179,12 +179,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-sqlalchemy"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
index 8cacbcebbd..c6a887d364 100644
--- a/.github/workflows/test-integrations-graphql.yml
+++ b/.github/workflows/test-integrations-graphql.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-strawberry"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
index 0f41af99c6..5f873e21bc 100644
--- a/.github/workflows/test-integrations-miscellaneous.yml
+++ b/.github/workflows/test-integrations-miscellaneous.yml
@@ -66,12 +66,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-trytond-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -133,12 +133,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-trytond"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
index f91a695c86..c55bb4cd96 100644
--- a/.github/workflows/test-integrations-networking.yml
+++ b/.github/workflows/test-integrations-networking.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-requests-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-requests"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
index 66cdd1d335..35fad306f3 100644
--- a/.github/workflows/test-integrations-web-frameworks-1.yml
+++ b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -80,12 +80,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-fastapi-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -161,12 +161,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-fastapi"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
index d52a17926d..04128a9975 100644
--- a/.github/workflows/test-integrations-web-frameworks-2.yml
+++ b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -86,12 +86,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-tornado-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -173,12 +173,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-tornado"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version == '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && matrix.python-version != '3.6'
+        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml

From 3dc12c2291a9a217733751a27e83393c0ec2eea5 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 10:42:20 +0200
Subject: [PATCH 09/14] maybe now the condition works

---
 .github/workflows/test-integrations-ai.yml               | 8 ++++----
 .github/workflows/test-integrations-aws-lambda.yml       | 4 ++--
 .github/workflows/test-integrations-cloud-computing.yml  | 8 ++++----
 .github/workflows/test-integrations-common.yml           | 4 ++--
 .github/workflows/test-integrations-data-processing.yml  | 8 ++++----
 .github/workflows/test-integrations-databases.yml        | 8 ++++----
 .github/workflows/test-integrations-graphql.yml          | 8 ++++----
 .github/workflows/test-integrations-miscellaneous.yml    | 8 ++++----
 .github/workflows/test-integrations-networking.yml       | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-1.yml | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-2.yml | 8 ++++----
 scripts/split-tox-gh-actions/templates/test_group.jinja  | 4 ++--
 12 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
index b11ce17fc3..ca67862796 100644
--- a/.github/workflows/test-integrations-ai.yml
+++ b/.github/workflows/test-integrations-ai.yml
@@ -66,12 +66,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -133,12 +133,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
index a71231df20..4c6c7d0398 100644
--- a/.github/workflows/test-integrations-aws-lambda.yml
+++ b/.github/workflows/test-integrations-aws-lambda.yml
@@ -85,12 +85,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
index 6394d4be3a..30ba8e5da0 100644
--- a/.github/workflows/test-integrations-cloud-computing.yml
+++ b/.github/workflows/test-integrations-cloud-computing.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gcp"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
index 4329b4c79a..ebc2ce7a93 100644
--- a/.github/workflows/test-integrations-common.yml
+++ b/.github/workflows/test-integrations-common.yml
@@ -50,12 +50,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-common"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
index 8f5ffe1ffa..e596a185cb 100644
--- a/.github/workflows/test-integrations-data-processing.yml
+++ b/.github/workflows/test-integrations-data-processing.yml
@@ -80,12 +80,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -161,12 +161,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
index 168507efc9..3a6f376b3a 100644
--- a/.github/workflows/test-integrations-databases.yml
+++ b/.github/workflows/test-integrations-databases.yml
@@ -89,12 +89,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -179,12 +179,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-sqlalchemy"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
index c6a887d364..02e1ac4a58 100644
--- a/.github/workflows/test-integrations-graphql.yml
+++ b/.github/workflows/test-integrations-graphql.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-strawberry"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
index 5f873e21bc..3cbfefebe8 100644
--- a/.github/workflows/test-integrations-miscellaneous.yml
+++ b/.github/workflows/test-integrations-miscellaneous.yml
@@ -66,12 +66,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-trytond-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -133,12 +133,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-trytond"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
index c55bb4cd96..8ddd8335df 100644
--- a/.github/workflows/test-integrations-networking.yml
+++ b/.github/workflows/test-integrations-networking.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-requests-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-requests"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
index 35fad306f3..6d6c7797f8 100644
--- a/.github/workflows/test-integrations-web-frameworks-1.yml
+++ b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -80,12 +80,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-fastapi-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -161,12 +161,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-fastapi"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
index 04128a9975..079af587b7 100644
--- a/.github/workflows/test-integrations-web-frameworks-2.yml
+++ b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -86,12 +86,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-tornado-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -173,12 +173,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-tornado"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6' 
+        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index 09dcb47bc4..d20e7f5ada 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -78,13 +78,13 @@
       {% endfor %}
 
       - name: Generate coverage XML (old python  {% raw %}${{ matrix.python-version }}{% endraw %})
-        if: {% raw %}${{ !cancelled() }} && ${{ matrix.python-version }} == '3.6'{% endraw %} 
+        if: {% raw %}${{ !cancelled() &&  matrix.python-version == '3.6' }}{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
 
       - name: Generate coverage XML (new pythons  {% raw %}${{ matrix.python-version }}{% endraw %})
-        if: {% raw %}${{ !cancelled() }} && ${{ matrix.python-version }} != '3.6'{% endraw %} 
+        if: {% raw %}${{ !cancelled() &&  matrix.python-version != '3.6' }}{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml

From 2602b65c514436a739b260cd57f64fc796b843d7 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 10:42:50 +0200
Subject: [PATCH 10/14] whitespace

---
 .github/workflows/test-integrations-ai.yml               | 8 ++++----
 .github/workflows/test-integrations-aws-lambda.yml       | 4 ++--
 .github/workflows/test-integrations-cloud-computing.yml  | 8 ++++----
 .github/workflows/test-integrations-common.yml           | 4 ++--
 .github/workflows/test-integrations-data-processing.yml  | 8 ++++----
 .github/workflows/test-integrations-databases.yml        | 8 ++++----
 .github/workflows/test-integrations-graphql.yml          | 8 ++++----
 .github/workflows/test-integrations-miscellaneous.yml    | 8 ++++----
 .github/workflows/test-integrations-networking.yml       | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-1.yml | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-2.yml | 8 ++++----
 scripts/split-tox-gh-actions/templates/test_group.jinja  | 4 ++--
 12 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
index ca67862796..f5867d3058 100644
--- a/.github/workflows/test-integrations-ai.yml
+++ b/.github/workflows/test-integrations-ai.yml
@@ -66,12 +66,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -133,12 +133,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
index 4c6c7d0398..af38230af6 100644
--- a/.github/workflows/test-integrations-aws-lambda.yml
+++ b/.github/workflows/test-integrations-aws-lambda.yml
@@ -85,12 +85,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
index 30ba8e5da0..b68e46c3c8 100644
--- a/.github/workflows/test-integrations-cloud-computing.yml
+++ b/.github/workflows/test-integrations-cloud-computing.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gcp"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
index ebc2ce7a93..cbfd2094ef 100644
--- a/.github/workflows/test-integrations-common.yml
+++ b/.github/workflows/test-integrations-common.yml
@@ -50,12 +50,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-common"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
index e596a185cb..7aceb76367 100644
--- a/.github/workflows/test-integrations-data-processing.yml
+++ b/.github/workflows/test-integrations-data-processing.yml
@@ -80,12 +80,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -161,12 +161,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
index 3a6f376b3a..96dab34d83 100644
--- a/.github/workflows/test-integrations-databases.yml
+++ b/.github/workflows/test-integrations-databases.yml
@@ -89,12 +89,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -179,12 +179,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-sqlalchemy"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
index 02e1ac4a58..5ae336349b 100644
--- a/.github/workflows/test-integrations-graphql.yml
+++ b/.github/workflows/test-integrations-graphql.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-strawberry"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
index 3cbfefebe8..ad0ecbb21a 100644
--- a/.github/workflows/test-integrations-miscellaneous.yml
+++ b/.github/workflows/test-integrations-miscellaneous.yml
@@ -66,12 +66,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-trytond-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -133,12 +133,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-trytond"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
index 8ddd8335df..14f0299a47 100644
--- a/.github/workflows/test-integrations-networking.yml
+++ b/.github/workflows/test-integrations-networking.yml
@@ -62,12 +62,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-requests-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -125,12 +125,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-requests"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
index 6d6c7797f8..b99222b2a0 100644
--- a/.github/workflows/test-integrations-web-frameworks-1.yml
+++ b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -80,12 +80,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-fastapi-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -161,12 +161,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-fastapi"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
index 079af587b7..25d22d5f3e 100644
--- a/.github/workflows/test-integrations-web-frameworks-2.yml
+++ b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -86,12 +86,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-tornado-latest"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
@@ -173,12 +173,12 @@ jobs:
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-tornado"
       - name: Generate coverage XML (old python  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version == '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
-        if: ${{ !cancelled() &&  matrix.python-version != '3.6' }} 
+        if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml
diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index d20e7f5ada..936c3a37dd 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -78,13 +78,13 @@
       {% endfor %}
 
       - name: Generate coverage XML (old python  {% raw %}${{ matrix.python-version }}{% endraw %})
-        if: {% raw %}${{ !cancelled() &&  matrix.python-version == '3.6' }}{% endraw %} 
+        if: {% raw %}${{ !cancelled() && matrix.python-version == '3.6' }}{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
 
       - name: Generate coverage XML (new pythons  {% raw %}${{ matrix.python-version }}{% endraw %})
-        if: {% raw %}${{ !cancelled() &&  matrix.python-version != '3.6' }}{% endraw %} 
+        if: {% raw %}${{ !cancelled() && matrix.python-version != '3.6' }}{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml

From f6a5e958ae86e2625a8930132a6b53c9821c46a7 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 11:04:15 +0200
Subject: [PATCH 11/14] Cleanup

---
 .github/workflows/test-integrations-ai.yml               | 8 ++++----
 .github/workflows/test-integrations-aws-lambda.yml       | 4 ++--
 .github/workflows/test-integrations-cloud-computing.yml  | 8 ++++----
 .github/workflows/test-integrations-common.yml           | 4 ++--
 .github/workflows/test-integrations-data-processing.yml  | 8 ++++----
 .github/workflows/test-integrations-databases.yml        | 8 ++++----
 .github/workflows/test-integrations-graphql.yml          | 8 ++++----
 .github/workflows/test-integrations-miscellaneous.yml    | 8 ++++----
 .github/workflows/test-integrations-networking.yml       | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-1.yml | 8 ++++----
 .github/workflows/test-integrations-web-frameworks-2.yml | 8 ++++----
 scripts/split-tox-gh-actions/templates/test_group.jinja  | 4 ++--
 12 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
index f5867d3058..65c82c4105 100644
--- a/.github/workflows/test-integrations-ai.yml
+++ b/.github/workflows/test-integrations-ai.yml
@@ -65,12 +65,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -132,12 +132,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
index af38230af6..0978264b9a 100644
--- a/.github/workflows/test-integrations-aws-lambda.yml
+++ b/.github/workflows/test-integrations-aws-lambda.yml
@@ -84,12 +84,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
index b68e46c3c8..75e9837054 100644
--- a/.github/workflows/test-integrations-cloud-computing.yml
+++ b/.github/workflows/test-integrations-cloud-computing.yml
@@ -61,12 +61,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -124,12 +124,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gcp"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
index cbfd2094ef..3415c6b637 100644
--- a/.github/workflows/test-integrations-common.yml
+++ b/.github/workflows/test-integrations-common.yml
@@ -49,12 +49,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-common"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
index 7aceb76367..4de0aa616f 100644
--- a/.github/workflows/test-integrations-data-processing.yml
+++ b/.github/workflows/test-integrations-data-processing.yml
@@ -79,12 +79,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -160,12 +160,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
index 96dab34d83..76753c24ee 100644
--- a/.github/workflows/test-integrations-databases.yml
+++ b/.github/workflows/test-integrations-databases.yml
@@ -88,12 +88,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -178,12 +178,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-sqlalchemy"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
index 5ae336349b..97b03f733a 100644
--- a/.github/workflows/test-integrations-graphql.yml
+++ b/.github/workflows/test-integrations-graphql.yml
@@ -61,12 +61,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -124,12 +124,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-strawberry"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
index ad0ecbb21a..58239b926c 100644
--- a/.github/workflows/test-integrations-miscellaneous.yml
+++ b/.github/workflows/test-integrations-miscellaneous.yml
@@ -65,12 +65,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-trytond-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -132,12 +132,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-trytond"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
index 14f0299a47..9a6826e013 100644
--- a/.github/workflows/test-integrations-networking.yml
+++ b/.github/workflows/test-integrations-networking.yml
@@ -61,12 +61,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-requests-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -124,12 +124,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-requests"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
index b99222b2a0..3fe1504f46 100644
--- a/.github/workflows/test-integrations-web-frameworks-1.yml
+++ b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -79,12 +79,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-fastapi-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -160,12 +160,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-fastapi"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
index 25d22d5f3e..11718afc12 100644
--- a/.github/workflows/test-integrations-web-frameworks-2.yml
+++ b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -85,12 +85,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-tornado-latest"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
@@ -172,12 +172,12 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-tornado"
-      - name: Generate coverage XML (old python  ${{ matrix.python-version }})
+      - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
-      - name: Generate coverage XML (new pythons  ${{ matrix.python-version }})
+      - name: Generate coverage XML
         if: ${{ !cancelled() && matrix.python-version != '3.6' }} 
         run: |
           coverage combine .coverage-sentry-*
diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index 936c3a37dd..88bc511533 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -77,13 +77,13 @@
           {% endif %}
       {% endfor %}
 
-      - name: Generate coverage XML (old python  {% raw %}${{ matrix.python-version }}{% endraw %})
+      - name: Generate coverage XML (Python 3.6)
         if: {% raw %}${{ !cancelled() && matrix.python-version == '3.6' }}{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
 
-      - name: Generate coverage XML (new pythons  {% raw %}${{ matrix.python-version }}{% endraw %})
+      - name: Generate coverage XML
         if: {% raw %}${{ !cancelled() && matrix.python-version != '3.6' }}{% endraw %} 
         run: |
           coverage combine .coverage-sentry-*

From 7d61edd5b46f143e848b3f06da4e15f127f3a6ba Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 12:54:22 +0200
Subject: [PATCH 12/14] Seperate coverage config for Python 3.6

---
 .coveragerc36 | 14 ++++++++++++++
 .gitignore    |  4 +++-
 tox.ini       |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 .coveragerc36

diff --git a/.coveragerc36 b/.coveragerc36
new file mode 100644
index 0000000000..722557bf6c
--- /dev/null
+++ b/.coveragerc36
@@ -0,0 +1,14 @@
+# This is the coverage.py config for Python 3.6
+# The config for newer Python versions is in pyproject.toml.
+
+[run]
+branch = true
+omit = 
+    /tmp/*
+    */tests/*
+    */.venv/*
+
+
+[report]
+exclude_lines = 
+    "if TYPE_CHECKING:",
diff --git a/.gitignore b/.gitignore
index cfd8070197..8c7a5f2174 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,9 @@
 *.db
 *.pid
 .python-version
-.coverage*
+.coverage
+.coverage-sentry*
+coverage.xml
 .junitxml*
 .DS_Store
 .tox
diff --git a/tox.ini b/tox.ini
index 47b3db753d..9c0092d7ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -684,6 +684,8 @@ setenv =
     PYTHONDONTWRITEBYTECODE=1
     OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
     COVERAGE_FILE=.coverage-sentry-{envname}
+    py3.6: COVERAGE_RCFILE=.coveragerc36
+
     django: DJANGO_SETTINGS_MODULE=tests.integrations.django.myapp.settings
 
     common: TESTPATH=tests

From 73720c8a24da941f943ed212d0c36ad7b7a63dce Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 13:06:13 +0200
Subject: [PATCH 13/14] Also use 3.6 config file for generating reports

---
 scripts/split-tox-gh-actions/templates/test_group.jinja | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
index 88bc511533..e63d6e0235 100644
--- a/scripts/split-tox-gh-actions/templates/test_group.jinja
+++ b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -80,6 +80,7 @@
       - name: Generate coverage XML (Python 3.6)
         if: {% raw %}${{ !cancelled() && matrix.python-version == '3.6' }}{% endraw %} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
 

From d084e1a7fc6bd4371fca3d131456800a4265dfda Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 5 Sep 2024 13:07:40 +0200
Subject: [PATCH 14/14] Updated test matrix

---
 .github/workflows/test-integrations-ai.yml               | 2 ++
 .github/workflows/test-integrations-aws-lambda.yml       | 1 +
 .github/workflows/test-integrations-cloud-computing.yml  | 2 ++
 .github/workflows/test-integrations-common.yml           | 1 +
 .github/workflows/test-integrations-data-processing.yml  | 2 ++
 .github/workflows/test-integrations-databases.yml        | 2 ++
 .github/workflows/test-integrations-graphql.yml          | 2 ++
 .github/workflows/test-integrations-miscellaneous.yml    | 2 ++
 .github/workflows/test-integrations-networking.yml       | 2 ++
 .github/workflows/test-integrations-web-frameworks-1.yml | 2 ++
 .github/workflows/test-integrations-web-frameworks-2.yml | 2 ++
 11 files changed, 20 insertions(+)

diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
index 65c82c4105..c3c8f7a689 100644
--- a/.github/workflows/test-integrations-ai.yml
+++ b/.github/workflows/test-integrations-ai.yml
@@ -68,6 +68,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -135,6 +136,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
index 0978264b9a..10e319f8a2 100644
--- a/.github/workflows/test-integrations-aws-lambda.yml
+++ b/.github/workflows/test-integrations-aws-lambda.yml
@@ -87,6 +87,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
index 75e9837054..94dd3473cd 100644
--- a/.github/workflows/test-integrations-cloud-computing.yml
+++ b/.github/workflows/test-integrations-cloud-computing.yml
@@ -64,6 +64,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -127,6 +128,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
index 3415c6b637..dbb3cb5d53 100644
--- a/.github/workflows/test-integrations-common.yml
+++ b/.github/workflows/test-integrations-common.yml
@@ -52,6 +52,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
index 4de0aa616f..6eb3a9f71f 100644
--- a/.github/workflows/test-integrations-data-processing.yml
+++ b/.github/workflows/test-integrations-data-processing.yml
@@ -82,6 +82,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -163,6 +164,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
index 76753c24ee..eca776d1c4 100644
--- a/.github/workflows/test-integrations-databases.yml
+++ b/.github/workflows/test-integrations-databases.yml
@@ -91,6 +91,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -181,6 +182,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
index 97b03f733a..c89423327a 100644
--- a/.github/workflows/test-integrations-graphql.yml
+++ b/.github/workflows/test-integrations-graphql.yml
@@ -64,6 +64,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -127,6 +128,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
index 58239b926c..492338c40e 100644
--- a/.github/workflows/test-integrations-miscellaneous.yml
+++ b/.github/workflows/test-integrations-miscellaneous.yml
@@ -68,6 +68,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -135,6 +136,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
index 9a6826e013..fb55e708ae 100644
--- a/.github/workflows/test-integrations-networking.yml
+++ b/.github/workflows/test-integrations-networking.yml
@@ -64,6 +64,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -127,6 +128,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
index 3fe1504f46..01b391992d 100644
--- a/.github/workflows/test-integrations-web-frameworks-1.yml
+++ b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -82,6 +82,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -163,6 +164,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
index 11718afc12..310921a250 100644
--- a/.github/workflows/test-integrations-web-frameworks-2.yml
+++ b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -88,6 +88,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML
@@ -175,6 +176,7 @@ jobs:
       - name: Generate coverage XML (Python 3.6)
         if: ${{ !cancelled() && matrix.python-version == '3.6' }} 
         run: |
+          export COVERAGE_RCFILE=.coveragerc36
           coverage combine .coverage-sentry-*
           coverage xml --ignore-errors
       - name: Generate coverage XML