diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2020-02-02 22:18:47 -0800 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2020-02-02 22:27:40 -0800 |
| commit | 9c5b1bae38ebc76fa446a638955fa3fab74641da (patch) | |
| tree | 65c5075354269d80fbdb95889f9a796553a37feb | |
| parent | 3db639fee74a10524e6908318f3f8f6e7c545e9b (diff) | |
| download | waitress-9c5b1bae38ebc76fa446a638955fa3fab74641da.tar.gz | |
Use tox -e py
This will cause it to pick the version to run against based upon the
version of Python it's installed for.
| -rw-r--r-- | .github/workflows/ci-linux.yml | 22 | ||||
| -rw-r--r-- | .github/workflows/ci-macos.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/ci-windows.yml | 18 |
3 files changed, 31 insertions, 29 deletions
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index fd64233..cc5639a 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -7,26 +7,26 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tox: [ - {'py': '2.7', 'env': 'py27'}, - {'py': '3.5', 'env': 'py35'}, - {'py': '3.6', 'env': 'py36'}, - {'py': '3.7', 'env': 'py37'}, - {'py': '3.8', 'env': 'py38'}, - {'py': 'pypy2', 'env': 'pypy'}, - {'py': 'pypy3', 'env': 'pypy3'} + py: [ + '2.7', + '3.5', + '3.6', + '3.7', + '3.8', + 'pypy2', + 'pypy3' ] - name: "Python: ${{ matrix.tox.py }}" + name: "Python: ${{ matrix.py }}" steps: - uses: actions/checkout@master - name: Setup python uses: actions/setup-python@v1 with: - python-version: ${{ matrix.tox.py }} + python-version: ${{ matrix.py }} architecture: x64 - run: pip install tox - name: Running tox - run: tox -e ${{ matrix.tox.env }} + run: tox -e py coverage: runs-on: ubuntu-latest name: Validate coverage for Python 2/3 diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index c8b6c63..384bbe6 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -7,24 +7,26 @@ jobs: runs-on: macOS-latest strategy: matrix: - tox: [ - {'py': '2.7', 'env': 'py27'}, - {'py': '3.5', 'env': 'py35'}, - {'py': '3.6', 'env': 'py36'}, - {'py': '3.7', 'env': 'py37'}, - {'py': '3.8', 'env': 'py38'}, + py: [ + '2.7', + '3.5', + '3.6', + '3.7', + '3.8', + 'pypy2', + 'pypy3' ] architecture: ['x64'] - name: "Python: ${{ matrix.tox.py }}" + name: "Python: ${{ matrix.py }}" steps: - uses: actions/checkout@master - name: Setup python uses: actions/setup-python@v1 with: - python-version: ${{ matrix.tox.py }} + python-version: ${{ matrix.py }} architecture: ${{ matrix.architecture }} - run: pip install tox - name: Running tox run: | ulimit -n 4096 - tox -e ${{ matrix.tox.env }} + tox -e py diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index cf0dd2b..1e6406f 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -7,22 +7,22 @@ jobs: runs-on: windows-2019 strategy: matrix: - tox: [ - {'py': '2.7', 'env': 'py27'}, - {'py': '3.5', 'env': 'py35'}, - {'py': '3.6', 'env': 'py36'}, - {'py': '3.7', 'env': 'py37'}, - {'py': '3.8', 'env': 'py38'}, + py: [ + '2.7', + '3.5', + '3.6', + '3.7', + '3.8' ] architecture: ['x86', 'x64'] - name: "Python: ${{ matrix.tox.py }} (${{ matrix.architecture }})" + name: "Python: ${{ matrix.py }} (${{ matrix.architecture }})" steps: - uses: actions/checkout@master - name: Setup python uses: actions/setup-python@v1 with: - python-version: ${{ matrix.tox.py }} + python-version: ${{ matrix.py }} architecture: ${{ matrix.architecture }} - run: pip install tox - name: Running tox - run: tox -e ${{ matrix.tox.env }} + run: tox -e py |