summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Howitz <mh@gocept.com>2022-12-09 08:31:17 +0100
committerMichael Howitz <mh@gocept.com>2022-12-09 08:33:41 +0100
commite5bd50d9ef71534220e0cad15136e7f948fd5fdf (patch)
treef6148d5b90f955a10b92538a404a691cde724295
parenta423790e14b44c11e180a9d082d57ff2cc7c7389 (diff)
downloadzope-location-master.tar.gz
Fix GHA: ubuntu-latest no longer contains Python 2.7 up to 3.6HEADmaster
-rw-r--r--.github/workflows/tests.yml4
-rw-r--r--.meta.toml2
-rw-r--r--tox.ini5
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3c40fa5..cedf24b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os:
- - ubuntu
+ - ["ubuntu", "ubuntu-20.04"]
config:
# [Python version, tox env]
- ["3.9", "lint"]
@@ -34,7 +34,7 @@ jobs:
- ["3.9", "docs"]
- ["3.9", "coverage"]
- runs-on: ${{ matrix.os }}-latest
+ runs-on: ${{ matrix.os[1] }}
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: ${{ matrix.config[1] }}
steps:
diff --git a/.meta.toml b/.meta.toml
index ef6abe6..f19cac4 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[meta]
template = "pure-python"
-commit-id = "90a5c439bc150722699aff9fa7cd96f6e59db536"
+commit-id = "200573eb414d2228d463da3de7d71a6d6335a704"
[python]
with-macos = false
diff --git a/tox.ini b/tox.ini
index 8ebc319..97ddca3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,6 +44,7 @@ deps =
[testenv:isort-apply]
basepython = python3
+skip_install = true
commands_pre =
deps =
isort
@@ -69,8 +70,8 @@ commands =
mkdir -p {toxinidir}/parts/htmlcov
coverage run -m zope.testrunner --test-path=src {posargs:-vc}
coverage run -a -m sphinx -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
- coverage html
- coverage report -m --fail-under=100
+ coverage html --ignore-errors
+ coverage report --ignore-errors --show-missing --fail-under=100
[coverage:run]
branch = True