Add support for Python 3.10. (#42)

zopefoundation · Oct 25, 2021 · 0b83ef5 · 0b83ef5
1 parent d7400a4
commit 0b83ef5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -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
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,21 +16,24 @@ jobs:
       # We want to see all failures:
       fail-fast: false
       matrix:
+        os:
+        - 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"]
+        - ["3.10",  "py310"]
         - ["pypy2", "pypy"]
         - ["pypy3", "pypy3"]
-        - ["3.8",   "docs"]
-        - ["3.8",   "coverage"]
+        - ["3.9",   "docs"]
+        - ["3.9",   "coverage"]
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}-latest
     name: ${{ matrix.config[1] }}
     steps:
     - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,11 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
+*.dll
 *.egg-info/
 *.profraw
 *.pyc
 *.pyo
+*.so
 .coverage
 .coverage.*
 .eggs/

diff --git a/.meta.toml b/.meta.toml
@@ -2,14 +2,15 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "d4e8550e4a37df10866d376fceac4e91689df8c5"
+commit-id = "7788b0c785ec23246369c0df9c6010e0047d8645"
 
 [python]
-with-appveyor = false
 with-pypy = true
 with-legacy-python = true
 with-docs = true
 with-sphinx-doctests = false
+with-windows = false
+with-future-python = false
 
 [coverage]
 fail-under = 93

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -16,7 +16,7 @@ Possibly breaking changes
 Features
 --------
 
-- Add support for Python 3.9.
+- Add support for Python 3.9 and 3.10.
 
 Other changes
 -------------

diff --git 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
@@ -10,6 +10,7 @@ envlist =
     py37
     py38
     py39
+    py310
     pypy
     pypy3
     docs
@@ -18,7 +19,6 @@ envlist =
 [testenv]
 usedevelop = true
 deps =
-    zope.testrunner
 setenv =
     ZOPE_INTERFACE_STRICT_IRO=1
 commands =
@@ -32,7 +32,8 @@ skip_install = true
 deps =
     flake8
     check-manifest
-    check-python-versions
+    check-python-versions >= 0.19.1
+    wheel
 commands =
     flake8 src setup.py
     check-manifest
@@ -41,8 +42,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 =
@@ -56,7 +55,6 @@ allowlist_externals =
 deps =
     coverage
     coverage-python-version
-    zope.testrunner
 commands =
     mkdir -p {toxinidir}/parts/htmlcov
     coverage run -m zope.testrunner --test-path=src {posargs:-vc}
@@ -66,7 +64,7 @@ commands =
 [coverage:run]
 branch = True
 plugins = coverage_python_version
-source = src
+source = zope.formlib
 
 [coverage:report]
 precision = 2