Tox Cleanup (#1749)

* Removed dead code from runtox shell script * Removed unused CI_PYTHON_VERSION
getsentry · Dec 14, 2022 · eb0db0a · eb0db0a
1 parent dd26fbe
commit eb0db0a
Show file tree

Hide file tree

Showing 31 changed files with 51 additions and 95 deletions.
diff --git a/.github/workflows/test-common.yml b/.github/workflows/test-common.yml
@@ -59,8 +59,6 @@ jobs:
           pip install codecov tox
 
       - name: Run Tests
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |

diff --git a/.github/workflows/test-integration-aiohttp.yml b/.github/workflows/test-integration-aiohttp.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -66,8 +66,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - 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
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test trytond
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |

diff --git 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}"
diff --git a/scripts/split-tox-gh-actions/ci-yaml.txt b/scripts/split-tox-gh-actions/ci-yaml.txt
@@ -41,8 +41,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test {{ framework }}
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |