Skip to content

Commit

Permalink
Fix GHA: ubuntu-latest no longer contains Python 3.5 and 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Dec 15, 2022
1 parent de4f4e6 commit 9d7c510
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu
- ["ubuntu", "ubuntu-20.04"]
config:
# [Python version, tox env]
- ["3.9", "lint"]
Expand All @@ -33,7 +33,7 @@ jobs:
- ["pypy-3.7", "pypy3"]
- ["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:
Expand Down
3 changes: 2 additions & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[meta]
template = "pure-python"
commit-id = "3e28a86e311ebffdf17f941c09d8ff646993d837"
commit-id = "200573eb414d2228d463da3de7d71a6d6335a704"

[python]
with-future-python = false
with-legacy-python = true
with-pypy = true
with-sphinx-doctests = false
with-windows = false
with-macos = false

[coverage]
fail-under = 88
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ deps =

[testenv:isort-apply]
basepython = python3
skip_install = true
commands_pre =
deps =
isort
Expand All @@ -59,8 +60,8 @@ deps =
commands =
mkdir -p {toxinidir}/parts/htmlcov
coverage run -m zope.testrunner --test-path=src {posargs:-vc}
coverage html
coverage report -m --fail-under=88
coverage html --ignore-errors
coverage report --ignore-errors --show-missing --fail-under=88

[coverage:run]
branch = True
Expand Down

0 comments on commit 9d7c510

Please sign in to comment.