Merge 317ded9 into a7af8d9

.github/workflows/tests.yml

@@ -0,0 +1,56 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+name: tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  schedule:
+    - cron: '0 12 * * 0'  # run once a week on Sunday
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        config:
+        # [Python version, tox env]
+        - ["3.8",   "lint"]
+        - ["2.7",   "py27"]
+        - ["3.5",   "py35"]
+        - ["3.6",   "py36"]
+        - ["3.7",   "py37"]
+        - ["3.8",   "py38"]
+        - ["3.9",   "py39"]
+        - ["pypy2", "pypy"]
+        - ["pypy3", "pypy3"]
+        - ["3.8",   "coverage"]
+
+    runs-on: ubuntu-latest
+    name: ${{ matrix.config[1] }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.config[0] }}
+    - name: Pip cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('setup.*', 'tox.ini') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+    - name: Test
+      run: tox -e ${{ matrix.config[1] }}
+    - name: Coverage
+      if: matrix.config[1] == 'coverage'
+      run: |
+        pip install coveralls coverage-python-version
+        coveralls
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.meta.cfg

@@ -2,6 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = pure-python
-commit-id = 05894360cac01f1027889dd14a23ae372e808b3f
-fail-under = 0
+commit-id = 1f1620d8f96c3f3781d1df0c591dd72a3f068879
+fail-under = 77
+with-pypy = True
 

CHANGES.rst

@@ -7,7 +7,7 @@
 
 - Add support for Python 3.8 and 3.9.
 
-- Drop support for Python 3.4 and 3.5.
+- Drop support for Python 3.4.
 
 
 4.4.0 (2018-08-24)

MANIFEST.in

@@ -4,15 +4,17 @@ include *.rst
 include *.txt
 include buildout.cfg
 include tox.ini
-
-exclude MANIFEST.in
+include .coveragerc
 
 recursive-include docs *.bat
 recursive-include docs *.py
 recursive-include docs *.rst
+recursive-include docs *.txt
 recursive-include docs Makefile
 
+recursive-include src *.gif
 recursive-include src *.pt
+recursive-include src *.py
 recursive-include src *.rst
 recursive-include src *.txt
 recursive-include src *.xml

setup.cfg

@@ -10,4 +10,3 @@ doctests = 1
 ignore =
     .editorconfig
     .meta.cfg
-    .travis.yml

setup.py

@@ -47,6 +47,7 @@ def read(*rnames):
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
@@ -77,7 +78,6 @@ def read(*rnames):
           '!=3.2.*',
           '!=3.3.*',
           '!=3.4.*',
-          '!=3.5.*',
       ]),
       install_requires=[
           'setuptools',

tox.ini

@@ -4,11 +4,12 @@
 envlist =
     lint,
     py27,
-    pypy,
+    py35,
     py36,
     py37,
     py38,
     py39,
+    pypy,
     pypy3,
     coverage
 
@@ -30,7 +31,7 @@ deps =
 commands =
     flake8 src setup.py
     check-manifest
-    check-python-versions .
+    check-python-versions
 
 [testenv:coverage]
 basepython = python3
@@ -41,7 +42,7 @@ deps =
 commands =
     coverage run -m zope.testrunner --test-path=src []
     coverage html
-    coverage report -m --fail-under=0
+    coverage report -m --fail-under=77
 
 [coverage:run]
 branch = True
@@ -51,10 +52,13 @@ source = src
 [coverage:report]
 precision = 2
 exclude_lines =
+    pragma: no cover
     pragma: nocover
     except ImportError:
     raise NotImplementedError
     if __name__ == '__main__':
+    self.fail
+    raise AssertionError
 
 [coverage:html]
 directory = htmlcov