summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Howitz <mh@gocept.com>2022-12-09 08:33:42 +0100
committerMichael Howitz <mh@gocept.com>2022-12-09 08:35:34 +0100
commitfd0d4eaed1cf6782be0ef0f7355f7dc459504885 (patch)
tree2eb60c72cd71be7f15b931d4420029b6e2137ed3
parent8f7c112a74a3c1aa576a0bd277f48bb52d2c99cd (diff)
downloadzope-exceptions-master.tar.gz
Fix GHA: ubuntu-latest no longer contains Python 3.6HEADmaster
-rw-r--r--.github/workflows/tests.yml10
-rw-r--r--.meta.toml3
-rw-r--r--tox.ini5
3 files changed, 10 insertions, 8 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 932104c..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,17 +34,17 @@ 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:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.config[0] }}
- name: Pip cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
diff --git a/.meta.toml b/.meta.toml
index bacd0f1..68d4ab7 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 = "b4dd6f9ffd3d6a2cde7dc70512c62d4c7ed22cd6"
+commit-id = "200573eb414d2228d463da3de7d71a6d6335a704"
[python]
with-pypy = true
@@ -11,6 +11,7 @@ with-docs = true
with-sphinx-doctests = true
with-windows = false
with-future-python = false
+with-macos = false
[tox]
use-flake8 = true
diff --git a/tox.ini b/tox.ini
index a29d4ba..19ea854 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=99.5
+ coverage html --ignore-errors
+ coverage report --ignore-errors --show-missing --fail-under=99.5
[coverage:run]
branch = True