Merge 9ae9c11 into 378216b

.github/workflows/tests.yml

@@ -4,14 +4,17 @@ 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:
         config:
         # [Python version, tox env]

.gitignore

@@ -10,16 +10,20 @@
 .installed.cfg
 .mr.developer.cfg
 .tox/
+.vscode/
 __pycache__/
 bin/
 build/
 coverage.xml
 develop-eggs/
+develop/
 dist/
 docs/_build
 eggs/
-htmlcov/
+etc/
 lib/
 lib64
+log/
 parts/
 pyvenv.cfg
+var/

.meta.toml

@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "4e9825189b9b8d18f28e7dbc63373d4baea08602"
+commit-id = "517293cf7fbff6d056b7fe699777e5336361dcbf"
 
 [python]
 with-pypy = true
@@ -13,3 +13,13 @@ with-appveyor = false
 
 [coverage]
 fail-under = 92
+
+[tox]
+use-flake8 = true
+
+[manifest]
+additional-rules = [
+    "recursive-include docs *.bat",
+    "recursive-include src *.pt",
+    "recursive-include src *.zcml",
+    ]

MANIFEST.in

@@ -5,14 +5,12 @@ include *.txt
 include buildout.cfg
 include tox.ini
 
-recursive-include docs *.bat
 recursive-include docs *.py
 recursive-include docs *.rst
 recursive-include docs *.txt
 recursive-include docs Makefile
 
-recursive-include src *.pt
 recursive-include src *.py
-recursive-include src *.rst
-recursive-include src *.txt
+recursive-include docs *.bat
+recursive-include src *.pt
 recursive-include src *.zcml

README.rst

@@ -1,6 +1,13 @@
 ``zope.dublincore``
 ===================
 
+.. image:: https://github.com/zopefoundation/zope.dublincore/actions/workflows/tests.yml/badge.svg
+   :target: https://github.com/zopefoundation/zope.dublincore/actions/workflows/tests.yml
+
+.. image:: https://readthedocs.org/projects/zopedublincore/badge/?version=latest
+   :target: http://zopedublincore.readthedocs.org/en/latest/
+   :alt: Documentation Status
+
 .. image:: https://img.shields.io/pypi/v/zope.dublincore.svg
    :target: https://pypi.python.org/pypi/zope.dublincore/
    :alt: Latest release
@@ -9,13 +16,6 @@
    :target: https://pypi.org/project/zope.dublincore/
    :alt: Supported Python versions
 
-.. image:: https://travis-ci.com/zopefoundation/zope.dublincore.svg?branch=master
-   :target: https://travis-ci.com/zopefoundation/zope.dublincore
-
-.. image:: https://readthedocs.org/projects/zopedublincore/badge/?version=latest
-   :target: http://zopedublincore.readthedocs.org/en/latest/
-   :alt: Documentation Status
-
 .. image:: https://coveralls.io/repos/github/zopefoundation/zope.dublincore/badge.svg?branch=master
    :target: https://coveralls.io/github/zopefoundation/zope.dublincore?branch=master
    :alt: Code Coverage

setup.py

@@ -96,7 +96,11 @@ def read(*path):
     extras_require={
         'testing': testing_require,
         'test': tests_require,
-        'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
+        'docs': [
+            'Sphinx',
+            'repoze.sphinx.autointerface',
+            'zope.testing',
+        ],
     },
     zip_safe=False,
 )

tox.ini

@@ -1,6 +1,7 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [tox]
+minversion = 3.18
 envlist =
     lint
     py27
@@ -18,8 +19,10 @@ envlist =
 usedevelop = true
 deps =
     zope.testrunner
+    # Until repoze.sphinx.autointerface supports Sphinx 4.x we cannot use it:
+    Sphinx < 4
 commands =
-    zope-testrunner --test-path=src []
+    zope-testrunner --test-path=src {posargs:-vc}
     sphinx-build -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
 extras =
     test
@@ -39,18 +42,27 @@ commands =
 
 [testenv:docs]
 basepython = python3
+skip_install = false
+# Until repoze.sphinx.autointerface supports Sphinx 4.x we cannot use it:
+deps = Sphinx < 4
+commands_pre =
 commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
     sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
 
 [testenv:coverage]
 basepython = python3
+allowlist_externals =
+    mkdir
 deps =
     coverage
     coverage-python-version
+    # Until repoze.sphinx.autointerface supports Sphinx 4.x we cannot use it:
+    Sphinx < 4
     zope.testrunner
 commands =
-    coverage run -m zope.testrunner --test-path=src []
+    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=92
@@ -72,4 +84,4 @@ exclude_lines =
     raise AssertionError
 
 [coverage:html]
-directory = htmlcov
+directory = parts/htmlcov