Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tox Cleanup #1749

Merged
merged 7 commits into from Dec 14, 2022
Merged

Tox Cleanup #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8627560
Cleanup runtox
antonpirker Nov 18, 2022
ef5b27e
Cleanup
antonpirker Nov 18, 2022
e920bd8
Moved deps back down to commands
antonpirker Nov 24, 2022
234cbbd
Merge branch 'master' into antonpirker/tox-cleanup
antonpirker Nov 24, 2022
7b52239
Fixed last dependency
antonpirker Nov 24, 2022
2e52170
Removed unused CI_PYTHON_VERSION
antonpirker Nov 24, 2022
f46dcb3
Merge branch 'master' into antonpirker/tox-cleanup
antonpirker Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/test-common.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-aiohttp.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-asgi.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-aws_lambda.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-beam.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-boto3.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-bottle.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-celery.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-chalice.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-django.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-falcon.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-fastapi.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-flask.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-gcp.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-httpx.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-pure_eval.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-pymongo.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-pyramid.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-quart.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-redis.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-rediscluster.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-requests.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-rq.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-sanic.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-sqlalchemy.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-starlette.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-tornado.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-integration-trytond.yml
View file
Open in desktop
Expand Up @@ -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: |
Expand Down
23 changes: 6 additions & 17 deletions scripts/runtox.sh
View file
Open in desktop
@@ -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
Expand All @@ -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}"
2 changes: 0 additions & 2 deletions scripts/split-tox-gh-actions/ci-yaml.txt
View file
Open in desktop
Expand Up @@ -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: |
Expand Down