From 8627560bba6062014f52a9c94d8f71477c38b133 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Fri, 18 Nov 2022 16:41:13 +0100
Subject: [PATCH 1/5] Cleanup runtox

---
 scripts/runtox.sh | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/scripts/runtox.sh b/scripts/runtox.sh
index a658da4132..8b4c4a1bef 100755
--- a/scripts/runtox.sh
+++ b/scripts/runtox.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# Usage: sh scripts/runtox.sh py3.7 <pytest-args>
+# Runs all environments with substring py3.7 and the given arguments for pytest
+
 set -ex
 
 if [ -n "$TOXPATH" ]; then
@@ -9,22 +13,7 @@ else
     TOXPATH=./.venv/bin/tox
 fi
 
-# Usage: sh scripts/runtox.sh py3.7 <pytest-args>
-# Runs all environments with substring py3.7 and the given arguments for pytest
-
-if [ -n "$1" ]; then
-    searchstring="$1"
-elif [ -n "$CI_PYTHON_VERSION" ]; then
-    searchstring="$(echo py$CI_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
-    if [ "$searchstring" = "pypy-2.7" ]; then
-        searchstring=pypy
-    fi
-elif [ -n "$AZURE_PYTHON_VERSION" ]; then
-    searchstring="$(echo py$AZURE_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
-    if [ "$searchstring" = pypy2 ]; then
-        searchstring=pypy
-    fi
-fi
+searchstring="$1"
 
 export TOX_PARALLEL_NO_SPINNER=1
-exec $TOXPATH -p auto -e $($TOXPATH -l | grep "$searchstring" | tr $'\n' ',') -- "${@:2}"
+exec $TOXPATH -p auto -e "$($TOXPATH -l | grep "$searchstring" | tr $'\n' ',')" -- "${@:2}"

From ef5b27ee4d09e5487078ca11d73eddf1e95f58c8 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Fri, 18 Nov 2022 17:11:35 +0100
Subject: [PATCH 2/5] Cleanup

---
 tox.ini | 96 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 61 insertions(+), 35 deletions(-)

diff --git a/tox.ini b/tox.ini
index 98505caab1..5635e1e672 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,77 +30,104 @@ envlist =
     # Django 4.x
     {py3.8,py3.9,py3.10}-django-{4.0,4.1}
 
+    # Flask
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12,1.0}
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-flask-1.1
     {py3.6,py3.8,py3.9,py3.10}-flask-2.0
 
-    {py3.7,py3.8,py3.9,py3.10}-asgi
+    # FastAPI
+    {py3.7,py3.8,py3.9,py3.10}-fastapi
 
+    # Starlette
     {py3.7,py3.8,py3.9,py3.10}-starlette-{0.19.1,0.20,0.21}
 
-    {py3.7,py3.8,py3.9,py3.10}-fastapi
-
+    # Quart
     {py3.7,py3.8,py3.9,py3.10}-quart
 
+    # Bottle
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-bottle-0.12
 
+    # Falcon
     {py2.7,py3.5,py3.6,py3.7}-falcon-1.4
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-falcon-2.0
 
+    # Sanic
     {py3.5,py3.6,py3.7}-sanic-{0.8,18}
     {py3.6,py3.7}-sanic-19
     {py3.6,py3.7,py3.8}-sanic-20
     {py3.7,py3.8,py3.9,py3.10}-sanic-21
     {py3.7,py3.8,py3.9,py3.10}-sanic-22
 
-    {py2.7}-celery-3
-    {py2.7,py3.5,py3.6}-celery-{4.1,4.2}
-    {py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
-    {py3.6,py3.7,py3.8}-celery-{5.0}
-    {py3.7,py3.8,py3.9,py3.10}-celery-{5.1,5.2}
-
+    # Beam
     py3.7-beam-{2.12,2.13,2.32,2.33}
 
+    # Chalice
+    {py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19,1.20}
+
+    # Asgi
+    {py3.7,py3.8,py3.9,py3.10}-asgi
+
+    # AWS Lambda
     # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
     py3.7-aws_lambda
 
+    # GCP
     py3.7-gcp
 
+    # Pyramid
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pyramid-{1.6,1.7,1.8,1.9,1.10}
 
-    {py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11}
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-rq-{0.12,0.13,1.0,1.1,1.2,1.3}
-    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-rq-{1.4,1.5}
-
+    # AIOHTTP
     py3.7-aiohttp-3.5
     {py3.7,py3.8,py3.9,py3.10}-aiohttp-3.6
 
+    # Tornado
     {py3.7,py3.8,py3.9}-tornado-{5}
     {py3.7,py3.8,py3.9,py3.10}-tornado-{6}
 
+    # Trytond
     {py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-{4.6,5.0,5.2}
     {py3.6,py3.7,py3.8,py3.9,py3.10}-trytond-{5.4}
 
-    {py2.7,py3.8,py3.9}-requests
+    # Celery
+    {py2.7}-celery-3
+    {py2.7,py3.5,py3.6}-celery-{4.1,4.2}
+    {py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
+    {py3.6,py3.7,py3.8}-celery-{5.0}
+    {py3.7,py3.8,py3.9,py3.10}-celery-{5.1,5.2}
 
+    # Redis
     {py2.7,py3.7,py3.8,py3.9}-redis
-    {py2.7,py3.7,py3.8,py3.9}-rediscluster-{1,2.1.0,2}
-
-    {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-{1.2,1.3}
-
-    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pure_eval
 
-    {py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19,1.20}
+    # Redis Cluster
+    {py2.7,py3.7,py3.8,py3.9}-rediscluster-{1,2.1.0,2}
 
-    {py2.7,py3.6,py3.7,py3.8}-boto3-{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
+    # RQ (Redis Queue)
+    {py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11}
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-rq-{0.12,0.13,1.0,1.1,1.2,1.3}
+    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-rq-{1.4,1.5}
 
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-{0.16,0.17}
+    # SQL Alchemy
+    {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-{1.2,1.3}
 
+    # Mongo DB
     {py2.7,py3.6}-pymongo-{3.1}
     {py2.7,py3.6,py3.7,py3.8,py3.9}-pymongo-{3.12}
     {py3.6,py3.7,py3.8,py3.9,py3.10}-pymongo-{4.0}
     {py3.7,py3.8,py3.9,py3.10}-pymongo-{4.1,4.2}
 
+    # HTTPX
+    {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-{0.16,0.17}
+
+    # Requests
+    {py2.7,py3.8,py3.9}-requests
+
+    # pure_eval
+    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pure_eval
+
+    # Boto3
+    {py2.7,py3.6,py3.7,py3.8}-boto3-{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
+
 [testenv]
 deps =
     # if you change test-requirements.txt and your change is not being reflected
@@ -111,6 +138,9 @@ deps =
     py3.4: colorama==0.4.1
     py3.4: watchdog==0.10.7
 
+    ; use old pytest for old Python versions:
+    {py2.7,py3.4,py3.5}: pytest-forked==1.1.3
+
     django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
 
     {py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels[daphne]>2
@@ -146,6 +176,15 @@ deps =
     flask-1.0: Flask>=1.0,<1.1
     flask-1.1: Flask>=1.1,<1.2
     flask-2.0: Flask>=2.0,<2.1
+    ; https://github.com/pytest-dev/pytest/issues/5532
+    {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12}: pytest<5
+    {py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: Werkzeug<2
+    ; https://github.com/more-itertools/more-itertools/issues/578
+    py3.5-flask-{0.11,0.12}: more-itertools<8.11.0
+    ; https://github.com/pallets/flask/issues/4455
+    {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: itsdangerous>=0.24,<2.0
+    {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: markupsafe<2.0.0
+    {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: jinja2<3.1.1
 
     asgi: pytest-asyncio
     asgi: async-asgi-testclient
@@ -358,19 +397,6 @@ basepython =
     linters: python3.9
 
 commands =
-    ; https://github.com/pytest-dev/pytest/issues/5532
-    {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12}: pip install pytest<5
-    {py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
-
-    ; https://github.com/pallets/flask/issues/4455
-    {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: pip install "itsdangerous>=0.24,<2.0" "markupsafe<2.0.0" "jinja2<3.1.1"
-
-    ; https://github.com/more-itertools/more-itertools/issues/578
-    py3.5-flask-{0.11,0.12}: pip install more-itertools<8.11.0
-
-    ; use old pytest for old Python versions:
-    {py2.7,py3.4,py3.5}: pip install pytest-forked==1.1.3
-
     py.test --durations=5 {env:TESTPATH} {posargs}
 
 [testenv:linters]

From e920bd844115333c211f94ffb0b5499bee038706 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 24 Nov 2022 14:35:07 +0100
Subject: [PATCH 3/5] Moved deps back down to commands

---
 tox.ini | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5635e1e672..027ecdb471 100644
--- a/tox.ini
+++ b/tox.ini
@@ -176,15 +176,6 @@ deps =
     flask-1.0: Flask>=1.0,<1.1
     flask-1.1: Flask>=1.1,<1.2
     flask-2.0: Flask>=2.0,<2.1
-    ; https://github.com/pytest-dev/pytest/issues/5532
-    {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12}: pytest<5
-    {py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: Werkzeug<2
-    ; https://github.com/more-itertools/more-itertools/issues/578
-    py3.5-flask-{0.11,0.12}: more-itertools<8.11.0
-    ; https://github.com/pallets/flask/issues/4455
-    {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: itsdangerous>=0.24,<2.0
-    {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: markupsafe<2.0.0
-    {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: jinja2<3.1.1
 
     asgi: pytest-asyncio
     asgi: async-asgi-testclient
@@ -397,6 +388,16 @@ basepython =
     linters: python3.9
 
 commands =
+    ; https://github.com/pytest-dev/pytest/issues/5532
+    {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12}: pip install pytest<5
+    {py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
+    ; https://github.com/pallets/flask/issues/4455
+    {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: pip install "itsdangerous>=0.24,<2.0" "markupsafe<2.0.0" "jinja2<3.1.1"
+    ; https://github.com/more-itertools/more-itertools/issues/578
+    py3.5-flask-{0.11,0.12}: pip install more-itertools<8.11.0
+    ; use old pytest for old Python versions:
+    {py2.7,py3.4,py3.5}: pip install pytest-forked==1.1.3
+
     py.test --durations=5 {env:TESTPATH} {posargs}
 
 [testenv:linters]

From 7b522396279b9e9f0a34739df3a63212a2cb713d Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 24 Nov 2022 14:45:39 +0100
Subject: [PATCH 4/5] Fixed last dependency

---
 tox.ini | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 027ecdb471..99af46461c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -138,9 +138,6 @@ deps =
     py3.4: colorama==0.4.1
     py3.4: watchdog==0.10.7
 
-    ; use old pytest for old Python versions:
-    {py2.7,py3.4,py3.5}: pytest-forked==1.1.3
-
     django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
 
     {py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels[daphne]>2

From 2e521709ef0b563b262d707787851e5c0953f092 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Thu, 24 Nov 2022 15:24:11 +0100
Subject: [PATCH 5/5] Removed unused CI_PYTHON_VERSION

---
 .github/workflows/test-common.yml                   | 4 +---
 .github/workflows/test-integration-aiohttp.yml      | 2 --
 .github/workflows/test-integration-asgi.yml         | 2 --
 .github/workflows/test-integration-aws_lambda.yml   | 2 --
 .github/workflows/test-integration-beam.yml         | 2 --
 .github/workflows/test-integration-boto3.yml        | 2 --
 .github/workflows/test-integration-bottle.yml       | 2 --
 .github/workflows/test-integration-celery.yml       | 2 --
 .github/workflows/test-integration-chalice.yml      | 2 --
 .github/workflows/test-integration-django.yml       | 2 --
 .github/workflows/test-integration-falcon.yml       | 2 --
 .github/workflows/test-integration-fastapi.yml      | 2 --
 .github/workflows/test-integration-flask.yml        | 2 --
 .github/workflows/test-integration-gcp.yml          | 2 --
 .github/workflows/test-integration-httpx.yml        | 2 --
 .github/workflows/test-integration-pure_eval.yml    | 2 --
 .github/workflows/test-integration-pymongo.yml      | 2 --
 .github/workflows/test-integration-pyramid.yml      | 2 --
 .github/workflows/test-integration-quart.yml        | 2 --
 .github/workflows/test-integration-redis.yml        | 2 --
 .github/workflows/test-integration-rediscluster.yml | 2 --
 .github/workflows/test-integration-requests.yml     | 2 --
 .github/workflows/test-integration-rq.yml           | 2 --
 .github/workflows/test-integration-sanic.yml        | 2 --
 .github/workflows/test-integration-sqlalchemy.yml   | 2 --
 .github/workflows/test-integration-starlette.yml    | 2 --
 .github/workflows/test-integration-tornado.yml      | 2 --
 .github/workflows/test-integration-trytond.yml      | 2 --
 scripts/split-tox-gh-actions/ci-yaml.txt            | 2 --
 29 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/.github/workflows/test-common.yml b/.github/workflows/test-common.yml
index 2c8964d4ae..a23e286b84 100644
--- a/.github/workflows/test-common.yml
+++ b/.github/workflows/test-common.yml
@@ -58,8 +58,6 @@ jobs:
           pip install codecov tox
 
       - name: Run Tests
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
@@ -69,4 +67,4 @@ jobs:
           ./scripts/runtox.sh "py${{ matrix.python-version }}$" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch --ignore=tests/integrations
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-aiohttp.yml b/.github/workflows/test-integration-aiohttp.yml
index 62f0a48ebf..dd2adff7bd 100644
--- a/.github/workflows/test-integration-aiohttp.yml
+++ b/.github/workflows/test-integration-aiohttp.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test aiohttp
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-asgi.yml b/.github/workflows/test-integration-asgi.yml
index 069ebbf3aa..9643ec549a 100644
--- a/.github/workflows/test-integration-asgi.yml
+++ b/.github/workflows/test-integration-asgi.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test asgi
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-aws_lambda.yml b/.github/workflows/test-integration-aws_lambda.yml
index 5e40fed7e6..19d8e4fb97 100644
--- a/.github/workflows/test-integration-aws_lambda.yml
+++ b/.github/workflows/test-integration-aws_lambda.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test aws_lambda
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-beam.yml b/.github/workflows/test-integration-beam.yml
index 55f8e015be..6d34c99b3f 100644
--- a/.github/workflows/test-integration-beam.yml
+++ b/.github/workflows/test-integration-beam.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test beam
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-boto3.yml b/.github/workflows/test-integration-boto3.yml
index 9b8747c5f8..95394c9e89 100644
--- a/.github/workflows/test-integration-boto3.yml
+++ b/.github/workflows/test-integration-boto3.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test boto3
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-bottle.yml b/.github/workflows/test-integration-bottle.yml
index 834638213b..fad018730f 100644
--- a/.github/workflows/test-integration-bottle.yml
+++ b/.github/workflows/test-integration-bottle.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test bottle
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-celery.yml b/.github/workflows/test-integration-celery.yml
index 17feb5a4ba..b8fd24d725 100644
--- a/.github/workflows/test-integration-celery.yml
+++ b/.github/workflows/test-integration-celery.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test celery
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-chalice.yml b/.github/workflows/test-integration-chalice.yml
index 36067fc7ca..95d37f9677 100644
--- a/.github/workflows/test-integration-chalice.yml
+++ b/.github/workflows/test-integration-chalice.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test chalice
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-django.yml b/.github/workflows/test-integration-django.yml
index db659728a8..b2ab0f75c4 100644
--- a/.github/workflows/test-integration-django.yml
+++ b/.github/workflows/test-integration-django.yml
@@ -65,8 +65,6 @@ jobs:
           pip install codecov tox
 
       - name: Test django
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-falcon.yml b/.github/workflows/test-integration-falcon.yml
index af4c701e1a..b9be8e79f7 100644
--- a/.github/workflows/test-integration-falcon.yml
+++ b/.github/workflows/test-integration-falcon.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test falcon
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-fastapi.yml b/.github/workflows/test-integration-fastapi.yml
index 6352d134e4..646a92feb3 100644
--- a/.github/workflows/test-integration-fastapi.yml
+++ b/.github/workflows/test-integration-fastapi.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test fastapi
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-flask.yml b/.github/workflows/test-integration-flask.yml
index 8e353814ff..fe3b62e02b 100644
--- a/.github/workflows/test-integration-flask.yml
+++ b/.github/workflows/test-integration-flask.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test flask
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-gcp.yml b/.github/workflows/test-integration-gcp.yml
index 8aa4e12b7a..78278fdc03 100644
--- a/.github/workflows/test-integration-gcp.yml
+++ b/.github/workflows/test-integration-gcp.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test gcp
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-httpx.yml b/.github/workflows/test-integration-httpx.yml
index f9e1b4ec31..efe97c1374 100644
--- a/.github/workflows/test-integration-httpx.yml
+++ b/.github/workflows/test-integration-httpx.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test httpx
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-pure_eval.yml b/.github/workflows/test-integration-pure_eval.yml
index ef39704c43..aef5dad176 100644
--- a/.github/workflows/test-integration-pure_eval.yml
+++ b/.github/workflows/test-integration-pure_eval.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test pure_eval
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-pymongo.yml b/.github/workflows/test-integration-pymongo.yml
index b2e82b7fb3..e1a005dbc6 100644
--- a/.github/workflows/test-integration-pymongo.yml
+++ b/.github/workflows/test-integration-pymongo.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test pymongo
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-pyramid.yml b/.github/workflows/test-integration-pyramid.yml
index bbd017b66f..8aa142a078 100644
--- a/.github/workflows/test-integration-pyramid.yml
+++ b/.github/workflows/test-integration-pyramid.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test pyramid
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-quart.yml b/.github/workflows/test-integration-quart.yml
index de7671dbda..214889f526 100644
--- a/.github/workflows/test-integration-quart.yml
+++ b/.github/workflows/test-integration-quart.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test quart
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-redis.yml b/.github/workflows/test-integration-redis.yml
index 60352088cd..17c1602d78 100644
--- a/.github/workflows/test-integration-redis.yml
+++ b/.github/workflows/test-integration-redis.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test redis
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-rediscluster.yml b/.github/workflows/test-integration-rediscluster.yml
index 5866637176..aafed2cf85 100644
--- a/.github/workflows/test-integration-rediscluster.yml
+++ b/.github/workflows/test-integration-rediscluster.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test rediscluster
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-requests.yml b/.github/workflows/test-integration-requests.yml
index 7e33b446db..08949aa4c9 100644
--- a/.github/workflows/test-integration-requests.yml
+++ b/.github/workflows/test-integration-requests.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test requests
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-rq.yml b/.github/workflows/test-integration-rq.yml
index e2a0ebaff8..ca7df229e8 100644
--- a/.github/workflows/test-integration-rq.yml
+++ b/.github/workflows/test-integration-rq.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test rq
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-sanic.yml b/.github/workflows/test-integration-sanic.yml
index aa99f54a90..501a247bd1 100644
--- a/.github/workflows/test-integration-sanic.yml
+++ b/.github/workflows/test-integration-sanic.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test sanic
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-sqlalchemy.yml b/.github/workflows/test-integration-sqlalchemy.yml
index ea36e0f562..667834d584 100644
--- a/.github/workflows/test-integration-sqlalchemy.yml
+++ b/.github/workflows/test-integration-sqlalchemy.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test sqlalchemy
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-starlette.yml b/.github/workflows/test-integration-starlette.yml
index a35544e9e9..3ac30ae204 100644
--- a/.github/workflows/test-integration-starlette.yml
+++ b/.github/workflows/test-integration-starlette.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test starlette
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-tornado.yml b/.github/workflows/test-integration-tornado.yml
index 17c1f18a8e..ff5f291da8 100644
--- a/.github/workflows/test-integration-tornado.yml
+++ b/.github/workflows/test-integration-tornado.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test tornado
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-trytond.yml b/.github/workflows/test-integration-trytond.yml
index 12771ffd21..5ff9411a1d 100644
--- a/.github/workflows/test-integration-trytond.yml
+++ b/.github/workflows/test-integration-trytond.yml
@@ -48,8 +48,6 @@ jobs:
           pip install codecov tox
 
       - name: Test trytond
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/scripts/split-tox-gh-actions/ci-yaml.txt b/scripts/split-tox-gh-actions/ci-yaml.txt
index 2e14cb5062..ad64bf0bea 100644
--- a/scripts/split-tox-gh-actions/ci-yaml.txt
+++ b/scripts/split-tox-gh-actions/ci-yaml.txt
@@ -45,8 +45,6 @@ jobs:
           pip install codecov tox
 
       - name: Test {{ framework }}
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |