Tox Cleanup

.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
+          codecov --file coverage.xml

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

.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: |

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}"

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: |