Add support for Python 3.10 + fix docs.

zopefoundation · Apr 11, 2022 · bd12df5 · bd12df5
1 parent 058cc0c
commit bd12df5
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 10 deletions.
diff --git 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
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
 [meta]
 template = "buildout-recipe"
-commit-id = "7f5b73fe9d2bcbabafaef5f69dd97408a142d42a"
+commit-id = "3b712f305ca8207e971c5bf81f2bdb5872489f2f"
 
 [python]
 with-pypy = true

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,7 @@ Changes
 0.8 (unreleased)
 ================
 
-- Add support for Python 3.8 and 3.9.
+- Add support for Python 3.8, 3.9, 3.10.
 
 - Drop support for Python 3.4.
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,23 @@
+<!--
+Generated from:
+https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+--> 
+# 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
@@ -1,5 +1,6 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/buildout-recipe
+include *.md
 include *.rst
 include *.txt
 include buildout.cfg

diff --git a/setup.py b/setup.py
@@ -34,6 +34,7 @@
           "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",
           "Topic :: Software Development :: Libraries :: Python Modules",

diff --git 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 =