From dc09037ee752eac732534ec566d366d0586706d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 02:04:40 +0100 Subject: [PATCH 01/23] Try running running all tox envs in one step --- .github/workflows/build.yml | 19 +++++-------------- tox.ini | 21 +++++---------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 160ddd430..0a2a4a7a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,35 +19,26 @@ on: jobs: build: - name: Python ${{ matrix.python-version }} (${{ matrix.platform }}) + name: Tests (${{ matrix.platform }}) runs-on: ${{ matrix.platform }} strategy: matrix: - python-version: - - "3.7" - - "3.8" platform: [ubuntu-latest, macos-latest] exclude: - platform: macos-latest - python-version: "3.7" - - platform: macos-latest - python-version: "3.8" max-parallel: 4 fail-fast: false steps: - uses: "actions/checkout@v2" - - uses: "actions/setup-python@v2" - with: - python-version: "${{ matrix.python-version }}" - name: "Install dependencies" run: | - python -mpip install --progress-bar=off tox tox-gh-actions -r'ci/requirements.txt' + python -mpip install --progress-bar=off tox -r'ci/requirements.txt' virtualenv --version pip --version tox --version - - name: "Run tox targets for ${{ matrix.python-version }}" + which python3.7 + which python3.8 + - name: "Run tox" run: "python -m tox -vv" - env: - PLATFORM: ${{ matrix.platform }} diff --git a/tox.ini b/tox.ini index 87174b04f..0f7a4fa06 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,8 @@ -[gh-actions] -# Map python versions used in build.yml to tox environments -# This mapping is used by tox-gh-actions -python = - 3.7: py37, clean, docs, report - 3.8: py38, clean, docs, report - -[gh-actions:env] -PLATFORM = - ubuntu-latest: linux - [tox] envlist = clean, docs, - py{37,38}-{cover,nocov}-{linux}, + py{37,38}-{cover,nocov}, report [testenv] @@ -89,7 +78,7 @@ commands = coverage erase skip_install = true deps = coverage -[testenv:py37-cover-{linux}] +[testenv:py37-cover] basepython = {env:TOXPYTHON:python3.7} setenv = {[testenv]setenv} @@ -100,10 +89,10 @@ deps = {[testenv]deps} pytest-cov -[testenv:py37-nocov-{linux}] +[testenv:py37-nocov] basepython = {env:TOXPYTHON:python3.7} -[testenv:py38-cover-{linux}] +[testenv:py38-cover] basepython = {env:TOXPYTHON:python3.8} setenv = {[testenv]setenv} @@ -114,5 +103,5 @@ deps = {[testenv]deps} pytest-cov -[testenv:py38-nocov-{linux}] +[testenv:py38-nocov] basepython = {env:TOXPYTHON:python3.8} From 9ef4353006e2c9c60aede646a43f4e37cdf1bbf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 02:33:30 +0100 Subject: [PATCH 02/23] Try installing multiple Python versions --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a2a4a7a5..a3ba88cfc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,12 @@ jobs: steps: - uses: "actions/checkout@v2" + - uses: "actions/setup-python@v2" + with: + python-version: "3.7" + - uses: "actions/setup-python@v2" + with: + python-version: "3.8" - name: "Install dependencies" run: | python -mpip install --progress-bar=off tox -r'ci/requirements.txt' From 404dd655eeabb950304d884446e1751d1f1f36a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 10:39:20 +0100 Subject: [PATCH 03/23] Change job name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a3ba88cfc..737ec41dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ on: jobs: build: - name: Tests (${{ matrix.platform }}) + name: Build (${{ matrix.platform }}) runs-on: ${{ matrix.platform }} strategy: From 697ce4f8f163b446e8cf682929a82756a8888530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 10:41:30 +0100 Subject: [PATCH 04/23] Try adding macOS back to tested platforms --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 737ec41dc..32290af9d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,8 +25,6 @@ jobs: strategy: matrix: platform: [ubuntu-latest, macos-latest] - exclude: - - platform: macos-latest max-parallel: 4 fail-fast: false From d5fe0e6647698b6c2f4ba9098be5c85f2affaac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 13:47:48 +0100 Subject: [PATCH 05/23] Change workflow name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32290af9d..746016407 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ # NB: this name is used in the status badge -name: "Tests, code style & coverage" +name: "build" on: push: From 1e79e94425db4301567ef44b97fe57dd0410c4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 13:48:18 +0100 Subject: [PATCH 06/23] Change step name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 746016407..8b4389faf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,5 +44,5 @@ jobs: tox --version which python3.7 which python3.8 - - name: "Run tox" + - name: "Tox" run: "python -m tox -vv" From 519898b7c42fea8a6061ed83abf38bb81c7a8018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 13:49:13 +0100 Subject: [PATCH 07/23] Try adding windows to the tested platforms --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b4389faf..496f0a7c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: - platform: [ubuntu-latest, macos-latest] + platform: [ubuntu-latest, macos-latest, windows-latest] max-parallel: 4 fail-fast: false From 3ed837b034804f07e281e1901a89e7475c9333cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 17:00:46 +0100 Subject: [PATCH 08/23] Output `pythonLocation` and it's contents --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 496f0a7c8..dc731975b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,9 +33,17 @@ jobs: - uses: "actions/setup-python@v2" with: python-version: "3.7" + - name: "Check Python install location contents" + run: | + echo ${{ env.pythonLocation }} + ls ${{ env.pythonLocation }} - uses: "actions/setup-python@v2" with: python-version: "3.8" + - name: "Check Python install location contents" + run: | + echo ${{ env.pythonLocation }} + ls ${{ env.pythonLocation }} - name: "Install dependencies" run: | python -mpip install --progress-bar=off tox -r'ci/requirements.txt' From 6c0957aba4c21fad1dd4922977ab6a5793e4df51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 17:35:54 +0100 Subject: [PATCH 09/23] Try symlinking windows binaries --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc731975b..2d9704e79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,14 +34,18 @@ jobs: with: python-version: "3.7" - name: "Check Python install location contents" + if: ${{ matrix.platform == 'windows-latest' }} run: | + ln -s ${{ env.pythonLocation }}/python.exe ${{ env.pythonLocation }}/python3.7.exe echo ${{ env.pythonLocation }} ls ${{ env.pythonLocation }} - uses: "actions/setup-python@v2" with: python-version: "3.8" - name: "Check Python install location contents" + if: ${{ matrix.platform == 'windows-latest' }} run: | + ln -s ${{ env.pythonLocation }}/python.exe ${{ env.pythonLocation }}/python3.8.exe echo ${{ env.pythonLocation }} ls ${{ env.pythonLocation }} - name: "Install dependencies" From a8e27a1309c0fd4f96724677103701cdf77952b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 18:20:57 +0100 Subject: [PATCH 10/23] Use hardlinks --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d9704e79..6f4cf7853 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - name: "Check Python install location contents" if: ${{ matrix.platform == 'windows-latest' }} run: | - ln -s ${{ env.pythonLocation }}/python.exe ${{ env.pythonLocation }}/python3.7.exe + ln ${{ env.pythonLocation }}/python.exe ${{ env.pythonLocation }}/python3.7.exe echo ${{ env.pythonLocation }} ls ${{ env.pythonLocation }} - uses: "actions/setup-python@v2" @@ -45,7 +45,7 @@ jobs: - name: "Check Python install location contents" if: ${{ matrix.platform == 'windows-latest' }} run: | - ln -s ${{ env.pythonLocation }}/python.exe ${{ env.pythonLocation }}/python3.8.exe + ln ${{ env.pythonLocation }}/python.exe ${{ env.pythonLocation }}/python3.8.exe echo ${{ env.pythonLocation }} ls ${{ env.pythonLocation }} - name: "Install dependencies" From 2fb64f0dadd443196ee101292f151735f7d5e339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Wed, 1 Dec 2021 18:21:26 +0100 Subject: [PATCH 11/23] Streamline Python version numbers Across tox and GitHub Actions. --- tox.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index 0f7a4fa06..fc71ee62b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = clean, docs, - py{37,38}-{cover,nocov}, + py{3.7,3.8}-{cover,nocov}, report [testenv] @@ -78,7 +78,7 @@ commands = coverage erase skip_install = true deps = coverage -[testenv:py37-cover] +[testenv:py3.7-cover] basepython = {env:TOXPYTHON:python3.7} setenv = {[testenv]setenv} @@ -89,10 +89,10 @@ deps = {[testenv]deps} pytest-cov -[testenv:py37-nocov] +[testenv:py3.7-nocov] basepython = {env:TOXPYTHON:python3.7} -[testenv:py38-cover] +[testenv:py3.8-cover] basepython = {env:TOXPYTHON:python3.8} setenv = {[testenv]setenv} @@ -103,5 +103,5 @@ deps = {[testenv]deps} pytest-cov -[testenv:py38-nocov] +[testenv:py3.8-nocov] basepython = {env:TOXPYTHON:python3.8} From 7c779df30e994da3e3457ce05c46ff3bb320d8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 00:53:34 +0100 Subject: [PATCH 12/23] Try using mklink instead of ln --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f4cf7853..ddddf0c51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - name: "Check Python install location contents" if: ${{ matrix.platform == 'windows-latest' }} run: | - ln ${{ env.pythonLocation }}/python.exe ${{ env.pythonLocation }}/python3.7.exe + mklink ${{ env.pythonLocation }}/python3.7.exe ${{ env.pythonLocation }}/python.exe echo ${{ env.pythonLocation }} ls ${{ env.pythonLocation }} - uses: "actions/setup-python@v2" From e236919fa691b03285a560d9114e6bea3732f80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 01:28:54 +0100 Subject: [PATCH 13/23] Use New-Item instead of `mklink` --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddddf0c51..5284f3ca3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - name: "Check Python install location contents" if: ${{ matrix.platform == 'windows-latest' }} run: | - mklink ${{ env.pythonLocation }}/python3.7.exe ${{ env.pythonLocation }}/python.exe + New-Item -ItemType SymbolicLink -Path ${{ env.pythonLocation }}/python3.7.exe -Target ${{ env.pythonLocation }}/python.exe echo ${{ env.pythonLocation }} ls ${{ env.pythonLocation }} - uses: "actions/setup-python@v2" From b3a7bef84a117325965e0c46e6c831d9c76a38a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 01:41:07 +0100 Subject: [PATCH 14/23] Use relative paths to create symbolic links --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5284f3ca3..36340c053 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,9 @@ jobs: - name: "Check Python install location contents" if: ${{ matrix.platform == 'windows-latest' }} run: | - New-Item -ItemType SymbolicLink -Path ${{ env.pythonLocation }}/python3.7.exe -Target ${{ env.pythonLocation }}/python.exe + cd ${{ env.pythonLocation }} + New-Item -ItemType SymbolicLink -Path python3.7.exe ` + -Target ${{ env.pythonLocation }}/python.exe echo ${{ env.pythonLocation }} ls ${{ env.pythonLocation }} - uses: "actions/setup-python@v2" From b5e821cd13e77be998d0206ec831541ece936e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:14:23 +0100 Subject: [PATCH 15/23] Rename build job --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36340c053..a76def6a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,8 +18,8 @@ on: # - LANG=en_US.UTF-8 jobs: - build: - name: Build (${{ matrix.platform }}) + tests: + name: tests (${{ matrix.platform }}) runs-on: ${{ matrix.platform }} strategy: From 9b2d3f395984408f6b898091527e22a79a85b99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:20:39 +0100 Subject: [PATCH 16/23] Use Python versions in build matrix again --- .github/workflows/build.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a76def6a8..21993535c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, macos-latest, windows-latest] + python-version: ["3.7", "3.8"] max-parallel: 4 fail-fast: false @@ -32,24 +33,16 @@ jobs: - uses: "actions/checkout@v2" - uses: "actions/setup-python@v2" with: - python-version: "3.7" + python-version: "${{ matrix.python-version }}" - name: "Check Python install location contents" if: ${{ matrix.platform == 'windows-latest' }} run: | cd ${{ env.pythonLocation }} - New-Item -ItemType SymbolicLink -Path python3.7.exe ` + New-Item -ItemType SymbolicLink ` + -Path python${{ matrix.python-version }}.exe ` -Target ${{ env.pythonLocation }}/python.exe echo ${{ env.pythonLocation }} ls ${{ env.pythonLocation }} - - uses: "actions/setup-python@v2" - with: - python-version: "3.8" - - name: "Check Python install location contents" - if: ${{ matrix.platform == 'windows-latest' }} - run: | - ln ${{ env.pythonLocation }}/python.exe ${{ env.pythonLocation }}/python3.8.exe - echo ${{ env.pythonLocation }} - ls ${{ env.pythonLocation }} - name: "Install dependencies" run: | python -mpip install --progress-bar=off tox -r'ci/requirements.txt' @@ -58,5 +51,5 @@ jobs: tox --version which python3.7 which python3.8 - - name: "Tox" - run: "python -m tox -vv" + - name: "Run tests" + run: "python -m tox -vv -e py${{ matrix.python-version }}-nocover" From 66893ff2d647bc1f69497c4687e9ef97e3ad03f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:21:45 +0100 Subject: [PATCH 17/23] Remove unnecessary debug output and checks --- .github/workflows/build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21993535c..4515170f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,22 +34,18 @@ jobs: - uses: "actions/setup-python@v2" with: python-version: "${{ matrix.python-version }}" - - name: "Check Python install location contents" + - name: "Create correctly named executable on Windows" if: ${{ matrix.platform == 'windows-latest' }} run: | cd ${{ env.pythonLocation }} New-Item -ItemType SymbolicLink ` -Path python${{ matrix.python-version }}.exe ` -Target ${{ env.pythonLocation }}/python.exe - echo ${{ env.pythonLocation }} - ls ${{ env.pythonLocation }} - name: "Install dependencies" run: | python -mpip install --progress-bar=off tox -r'ci/requirements.txt' virtualenv --version pip --version tox --version - which python3.7 - which python3.8 - name: "Run tests" run: "python -m tox -vv -e py${{ matrix.python-version }}-nocover" From 5de5d85f41f037d4aba3ff58c98536327403a799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:22:06 +0100 Subject: [PATCH 18/23] Add a job for building docs --- .github/workflows/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4515170f5..78494fe49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,18 @@ on: # - LANG=en_US.UTF-8 jobs: + docs: + name: docs + steps: + - uses: "actions/checkout@v2" + - name: "Install dependencies" + run: | + python -mpip install --progress-bar=off tox -r'ci/requirements.txt' + virtualenv --version + pip --version + tox --version + - name: "Build documentation" + run: "python -m tox -vv -e docs" tests: name: tests (${{ matrix.platform }}) runs-on: ${{ matrix.platform }} From 8a4d7e0d67c762ff458488e3822ffb3bc1749285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:28:34 +0100 Subject: [PATCH 19/23] Build docs for every platform --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78494fe49..9a5ade9d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,13 @@ on: jobs: docs: - name: docs + name: docs (${{ matrix.platform }}) + runs-on: ${{ matrix.platform }} + strategy: + matrix: + platform: [ubuntu-latest, macos-latest, windows-latest] + max-parallel: 4 + fail-fast: false steps: - uses: "actions/checkout@v2" - name: "Install dependencies" From 6fd9b4fc53583decc7c798ad60dd4beab8d7438b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:30:44 +0100 Subject: [PATCH 20/23] Fix test environment name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a5ade9d2..25910b7a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,4 +66,4 @@ jobs: pip --version tox --version - name: "Run tests" - run: "python -m tox -vv -e py${{ matrix.python-version }}-nocover" + run: "python -m tox -vv -e py${{ matrix.python-version }}-nocov" From 47ee99196ffd039e29c948e0fdce81cf96f71bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:31:46 +0100 Subject: [PATCH 21/23] Reinstate the check environment --- .github/workflows/build.yml | 18 ++++++++++++++++++ tox.ini | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25910b7a2..fdf569e13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,24 @@ on: # - LANG=en_US.UTF-8 jobs: + check: + name: check (${{ matrix.platform }}) + runs-on: ${{ matrix.platform }} + strategy: + matrix: + platform: [ubuntu-latest, macos-latest, windows-latest] + max-parallel: 4 + fail-fast: false + steps: + - uses: "actions/checkout@v2" + - name: "Install dependencies" + run: | + python -mpip install --progress-bar=off tox -r'ci/requirements.txt' + virtualenv --version + pip --version + tox --version + - name: "Build documentation" + run: "python -m tox -vv -e check" docs: name: docs (${{ matrix.platform }}) runs-on: ${{ matrix.platform }} diff --git a/tox.ini b/tox.ini index fc71ee62b..649464e07 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,14 @@ [tox] envlist = clean, + check, docs, py{3.7,3.8}-{cover,nocov}, report [testenv] basepython = - {bootstrap,clean,report,docs,codecov,coveralls}: {env:TOXPYTHON:python3} + {bootstrap,clean,check,report,docs,codecov,coveralls}: {env:TOXPYTHON:python3} setenv = PYTHONPATH={toxinidir}/tests PYTHONUNBUFFERED=yes From 424723cc98f9699b9a81deaf3ebe261e13b33fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:48:08 +0100 Subject: [PATCH 22/23] Remove unnecessary dependencies Both, running the checks and building the documentation, are done inside the repository instead of an isolated environment, so there's no need for "virtualenv" or the other CI dependencies. --- .github/workflows/build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fdf569e13..337ed029d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,9 +30,7 @@ jobs: - uses: "actions/checkout@v2" - name: "Install dependencies" run: | - python -mpip install --progress-bar=off tox -r'ci/requirements.txt' - virtualenv --version - pip --version + python -mpip install --progress-bar=off tox tox --version - name: "Build documentation" run: "python -m tox -vv -e check" @@ -48,9 +46,7 @@ jobs: - uses: "actions/checkout@v2" - name: "Install dependencies" run: | - python -mpip install --progress-bar=off tox -r'ci/requirements.txt' - virtualenv --version - pip --version + python -mpip install --progress-bar=off tox tox --version - name: "Build documentation" run: "python -m tox -vv -e docs" From 106e8303c81473b9c27f5cd8f8b5475e80118792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20G=C3=BCnther?= Date: Thu, 2 Dec 2021 03:50:34 +0100 Subject: [PATCH 23/23] Change the workflow's name to "tox" --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 337ed029d..1ae2ccc88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ # NB: this name is used in the status badge -name: "build" +name: "tox" on: push: