From 4aea414e0a066dfd5044136dfba2f3a85e370c3a Mon Sep 17 00:00:00 2001
From: Michael Howitz <mh@gocept.com>
Date: Thu, 31 Mar 2022 08:29:03 +0200
Subject: [PATCH] Add support for Python 3.10.

Fix docs.
Fix badge.
---
 .github/workflows/tests.yml | 11 ++++++-----
 .meta.toml                  |  2 +-
 CHANGES.rst                 |  2 +-
 CONTRIBUTING.md             | 23 +++++++++++++++++++++++
 MANIFEST.in                 |  1 +
 README.rst                  |  4 ++--
 setup.py                    |  1 +
 tox.ini                     |  5 ++---
 8 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9ea114e..927d9f3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,17 +20,18 @@ jobs:
         - ubuntu
         config:
         # [Python version, tox env]
-        - ["3.8",   "lint"]
+        - ["3.9",   "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",   "docs"]
-        - ["3.8",   "coverage"]
+        - ["3.10",  "py310"]
+        - ["pypy-2.7", "pypy"]
+        - ["pypy-3.7", "pypy3"]
+        - ["3.9",   "docs"]
+        - ["3.9",   "coverage"]
 
     runs-on: ${{ matrix.os }}-latest
     name: ${{ matrix.config[1] }}
diff --git a/.meta.toml b/.meta.toml
index c58a0eb..385ca96 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "d3627ba9bcb25d0c7cb09b96d695040a20e0ab2b"
+commit-id = "863bceecb48a88d769063e4dedce3fd77d2b6187"
 
 [python]
 with-pypy = true
diff --git a/CHANGES.rst b/CHANGES.rst
index 55c7c03..e4490f3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@
 4.2.0 (unreleased)
 ==================
 
-- Add support for Python 3.7, 3.8 and 3.9.
+- Add support for Python 3.7, 3.8, 3.9, and 3.10.
 
 - Drop support for Python 3.4.
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..31d95f0
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,23 @@
+<!--
+Generated from:
+https://github.com/zopefoundation/meta/tree/master/config/pure-python
+--> 
+# Contributing to zopefoundation projects
+
+The projects under the zopefoundation GitHub organization are open source and
+welcome contributions in different forms:
+
+* bug reports
+* code improvements and bug fixes
+* documentation improvements
+* pull request reviews
+
+For any changes in the repository besides trivial typo fixes you are required
+to sign the contributor agreement. See
+https://www.zope.dev/developer/becoming-a-committer.html for details.
+
+Please visit our [Developer
+Guidelines](https://www.zope.dev/developer/guidelines.html) if you'd like to
+contribute code changes and our [guidelines for reporting
+bugs](https://www.zope.dev/developer/reporting-bugs.html) if you want to file a
+bug report.
diff --git a/MANIFEST.in b/MANIFEST.in
index a2417cd..fdee1cc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
+include *.md
 include *.rst
 include *.txt
 include buildout.cfg
diff --git a/README.rst b/README.rst
index 3dbfaba..f1047c8 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
         :target: http://zopeapponlinehelp.readthedocs.io/en/latest/?badge=latest
         :alt: Documentation Status
 
-.. image:: https://travis-ci.org/zopefoundation/zope.app.onlinehelp.svg?branch=master
-        :target: https://travis-ci.org/zopefoundation/zope.app.onlinehelp
+.. image:: https://github.com/zopefoundation/zope.app.onlinehelp/actions/workflows/tests.yml/badge.svg
+        :target: https://github.com/zopefoundation/zope.app.onlinehelp/actions/workflows/tests.yml
         :alt: Build Status
 
 .. image:: https://coveralls.io/repos/github/zopefoundation/zope.app.onlinehelp/badge.svg?branch=master
diff --git a/setup.py b/setup.py
index 6013a94..8566233 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ def read(*rnames):
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Natural Language :: English',
diff --git a/tox.ini b/tox.ini
index 0451ff2..5ba91cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ envlist =
     py37
     py38
     py39
+    py310
     pypy
     pypy3
     docs
@@ -29,7 +30,7 @@ skip_install = true
 deps =
     flake8
     check-manifest
-    check-python-versions
+    check-python-versions >= 0.19.1
     wheel
 commands =
     flake8 src setup.py
@@ -39,8 +40,6 @@ commands =
 [testenv:docs]
 basepython = python3
 skip_install = false
-# Until repoze.sphinx.autointerface supports Sphinx 4.x we cannot use it:
-deps = Sphinx < 4
 extras =
     docs
 commands_pre =