Skip to content

Commit

Permalink
Merge 97c7dc0 into 7aff6c0
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Jul 2, 2021
2 parents 7aff6c0 + 97c7dc0 commit 32dd022
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ max_line_length = off
# 4 space indentation
indent_size = 4

[*.{yml,zpt,pt,dtml}]
[*.{yml,zpt,pt,dtml,zcml}]
# 2 space indentation
indent_size = 2

Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,20 @@ name: tests

on:
push:
branches: [ master ]
pull_request:
schedule:
- cron: '0 12 * * 0' # run once a week on Sunday
# Allow to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
strategy:
# We want to see all failures:
fail-fast: false
matrix:
os:
- ubuntu
config:
# [Python version, tox env]
- ["3.8", "lint"]
Expand All @@ -22,11 +27,12 @@ jobs:
- ["3.7", "py37"]
- ["3.8", "py38"]
- ["3.9", "py39"]
- ["3.10", "py310"]
- ["pypy2", "pypy"]
- ["pypy3", "pypy3"]
- ["3.8", "coverage"]

runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}-latest
name: ${{ matrix.config[1] }}
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,27 @@
*.profraw
*.pyc
*.pyo
*.so
.coverage
.coverage.*
.eggs/
.installed.cfg
.mr.developer.cfg
.tox/
.vscode/
__pycache__/
bin/
build/
coverage.xml
develop-eggs/
develop/
dist/
docs/_build
eggs/
etc/
lib/
lib64
log/
parts/
pyvenv.cfg
var/
14 changes: 10 additions & 4 deletions .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[meta]
template = "pure-python"
commit-id = "ae6fbae62663edb6a8b62d2dbdfe0589f64b8844"
commit-id = "26fae87d19fe1cd8e51298fd288201989467fea9"

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

[coverage]
fail-under = 89

[tox]
use-flake8 = true
testenv-deps = [
"zope.testrunner",
]
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changelog
4.2 (unreleased)
----------------

- Add support for Python 3.8 and 3.9.
- Add support for Python 3.8, 3.9 and 3.10 (as of beta3).


4.1 (2018-10-05)
Expand Down
4 changes: 0 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,4 @@ include *.txt
include buildout.cfg
include tox.ini

recursive-include src *.pt
recursive-include src *.py
recursive-include src *.rst
recursive-include src *.txt
recursive-include src *.zcml
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ envlist =
py37
py38
py39
py310
pypy
pypy3
coverage
Expand All @@ -19,7 +20,7 @@ usedevelop = true
deps =
zope.testrunner
commands =
zope-testrunner --test-path=src []
zope-testrunner --test-path=src {posargs:-vc}
extras =
test

Expand All @@ -45,14 +46,14 @@ deps =
zope.testrunner
commands =
mkdir -p {toxinidir}/parts/htmlcov
coverage run -m zope.testrunner --test-path=src []
coverage run -m zope.testrunner --test-path=src {posargs:-vc}
coverage html
coverage report -m --fail-under=89

[coverage:run]
branch = True
plugins = coverage_python_version
source = src
source = Missing

[coverage:report]
precision = 2
Expand Down

0 comments on commit 32dd022

Please sign in to comment.