Skip to content

Commit 7f1a5c2

Browse files
author
Michael Howitz
authored
Fix GHA: ubuntu-latest no longer contains Python 3.6 (#245)
1 parent 2c0b024 commit 7f1a5c2

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

.github/workflows/tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os:
20-
- ubuntu
21-
- windows
20+
- ["ubuntu", "ubuntu-20.04"]
21+
- ["windows", "windows-latest"]
2222
config:
2323
# [Python version, tox env]
2424
- ["3.9", "lint"]
@@ -32,21 +32,21 @@ jobs:
3232
- ["3.9", "coverage"]
3333
- ["3.9", "py39-datetime"]
3434
exclude:
35-
- { os: windows, config: ["3.9", "lint"] }
36-
- { os: windows, config: ["3.9", "docs"] }
37-
- { os: windows, config: ["3.9", "coverage"] }
35+
- { os: ["windows", "windows-latest"], config: ["3.9", "lint"] }
36+
- { os: ["windows", "windows-latest"], config: ["3.9", "docs"] }
37+
- { os: ["windows", "windows-latest"], config: ["3.9", "coverage"] }
3838

39-
runs-on: ${{ matrix.os }}-latest
39+
runs-on: ${{ matrix.os[1] }}
4040
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
41-
name: ${{ matrix.os }}-${{ matrix.config[1] }}
41+
name: ${{ matrix.os[0] }}-${{ matrix.config[1] }}
4242
steps:
43-
- uses: actions/checkout@v2
43+
- uses: actions/checkout@v3
4444
- name: Set up Python
45-
uses: actions/setup-python@v2
45+
uses: actions/setup-python@v4
4646
with:
4747
python-version: ${{ matrix.config[0] }}
4848
- name: Pip cache
49-
uses: actions/cache@v2
49+
uses: actions/cache@v3
5050
with:
5151
path: ~/.cache/pip
5252
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}

.meta.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
33
[meta]
44
template = "pure-python"
5-
commit-id = "70229255d495a945324228b50ee735cc75e01430"
5+
commit-id = "200573eb414d2228d463da3de7d71a6d6335a704"
66

77
[python]
88
with-pypy = false
@@ -11,6 +11,7 @@ with-docs = true
1111
with-sphinx-doctests = true
1212
with-windows = true
1313
with-future-python = false
14+
with-macos = false
1415

1516
[tox]
1617
use-flake8 = true

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ deps =
6666

6767
[testenv:isort-apply]
6868
basepython = python3
69+
skip_install = true
6970
commands_pre =
7071
deps =
7172
isort
@@ -95,8 +96,8 @@ commands =
9596
mkdir -p {toxinidir}/parts/htmlcov
9697
pytest --cov=src --cov=tests --cov-report= {posargs}
9798
coverage run -a -m sphinx -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
98-
coverage html
99-
coverage report -m --fail-under=98.5
99+
coverage html --ignore-errors
100+
coverage report --ignore-errors --show-missing --fail-under=98.5
100101

101102
[coverage:run]
102103
branch = True

0 commit comments

Comments
 (0)