From dc14d8c57c4602b94d35328cfabcb25f7a35e61b Mon Sep 17 00:00:00 2001 From: Michael Seifert Date: Fri, 11 Mar 2022 11:40:51 +0100 Subject: [PATCH 1/5] ci: No longer fail silently when the expected Python interpreter is missing. The tox "lint" target expects Python 3.10 to be installed, but CI only installs Python 3.9. skip_missing_interpreters caused the "lint" workflow in CI to exit successfully, even though no linting was performed. Signed-off-by: Michael Seifert --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index 53aca291..32d035d2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] minversion = 3.14.0 envlist = py37, py38, py39, py310, lint, version-info, pytest-min -skip_missing_interpreters = true isolated_build = true passenv = CI From 90732cbf544c99fffba400d789ffeb14b35870d7 Mon Sep 17 00:00:00 2001 From: Michael Seifert Date: Fri, 11 Mar 2022 11:46:09 +0100 Subject: [PATCH 2/5] ci: Install Python 3.10 for the "lint" workflow, as expected by the tox configuration. Signed-off-by: Michael Seifert --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a5ffe577..9036f312 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-python@v3 with: - python-version: '3.9' + python-version: '3.10' - name: Install GitHub matcher for ActionLint checker run: | echo "::add-matcher::.github/actionlint-matcher.json" From 2878c596983a16bc286e1c9a8b79199c79750dc1 Mon Sep 17 00:00:00 2001 From: Michael Seifert Date: Fri, 11 Mar 2022 11:50:30 +0100 Subject: [PATCH 3/5] ci: Do not inlcude tox's "lint" environment in the set of "3.9" environments of a GitHub actions run. Linting is performed explicitly in a separate workflow and does not need to be run as part of the Python 3.9 tests. Additionally, linting currently expects Python 3.10 and will fail during the Python 3.9 test run. Signed-off-by: Michael Seifert --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 32d035d2..1aeeac26 100644 --- a/tox.ini +++ b/tox.ini @@ -50,6 +50,6 @@ commands = python = 3.7: py37, pytest-min 3.8: py38 - 3.9: py39, lint + 3.9: py39 3.10: py310 pypy3: pypy3 From 46a95fb7c99d46303136cfae3519b17b17571c65 Mon Sep 17 00:00:00 2001 From: Michael Seifert Date: Fri, 11 Mar 2022 11:53:43 +0100 Subject: [PATCH 4/5] build: Dependencies for tox's "lint" environent are installed correctly. The lint environment requires mypy from the test dependencies to be installed. Although the environment defines `extras = testing`, it also specifies `skip_install = true`, which also skips installation of test dependencies. This change removes skip_install = true, so that mypy is installed correctly. Signed-off-by: Michael Seifert --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1aeeac26..8bbb9c3f 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,6 @@ allowlist_externals = make [testenv:lint] -skip_install = true basepython = python3.10 extras = testing deps = From f8eb9ef84b963265c5d06db600e0ed8969dc0b8e Mon Sep 17 00:00:00 2001 From: Michael Seifert Date: Fri, 11 Mar 2022 11:58:12 +0100 Subject: [PATCH 5/5] build: Removed the explicit interpreter version dependency from tox's "version-info" environment. Signed-off-by: Michael Seifert --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8bbb9c3f..00d45222 100644 --- a/tox.ini +++ b/tox.ini @@ -39,7 +39,6 @@ commands = coverage report [testenv:version-info] -basepython = python3.9 deps = packaging == 21.3 commands =