Add support for Python 3.10. (#35)

* Use latest manylinux build containers. * Update to current meta/config + disable Python 3.10 on AppVeyor. (It cannot run successfully before the final release.)
zopefoundation · Jul 16, 2021 · 14c7e10 · 14c7e10
1 parent f6678f5
commit 14c7e10
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -102,6 +102,7 @@ jobs:
           - 3.7
           - 3.8
           - 3.9
+          - 3.10.0-beta.3
         os: [ubuntu-20.04, macos-latest]
         exclude:
           - os: macos-latest
@@ -187,6 +188,7 @@ jobs:
           - 3.7
           - 3.8
           - 3.9
+          - 3.10.0-beta.3
         os: [ubuntu-20.04, macos-latest]
         exclude:
           - os: macos-latest
@@ -361,13 +363,13 @@ jobs:
         # The 2010 image is the most recent spec that comes with Python 2.7,
         # and only up through the tag 2021-02-06-3d322a5
         env:
-          DOCKER_IMAGE: quay.io/pypa/${{ matrix.image }}:2021-02-06-3d322a5
+          DOCKER_IMAGE: quay.io/pypa/${{ matrix.image }}
         run: |
           bash .manylinux.sh
       - name: Build ExtensionClass (i686)
         if: matrix.image == 'manylinux2010_i686'
         env:
-          DOCKER_IMAGE: quay.io/pypa/${{ matrix.image }}:2021-02-06-3d322a5
+          DOCKER_IMAGE: quay.io/pypa/${{ matrix.image }}
           PRE_CMD: linux32
         run: |
           bash .manylinux.sh

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
+*.dll
 *.egg-info/
 *.profraw
 *.pyc

diff --git a/.manylinux-install.sh b/.manylinux-install.sh
@@ -30,6 +30,7 @@ for PYBIN in /opt/python/*/bin; do
        [[ "${PYBIN}" == *"cp36"* ]] || \
        [[ "${PYBIN}" == *"cp37"* ]] || \
        [[ "${PYBIN}" == *"cp38"* ]] || \
+       [[ "${PYBIN}" == *"cp310"* ]] || \
        [[ "${PYBIN}" == *"cp39"* ]]; then
         "${PYBIN}/pip" install -e /io/
         "${PYBIN}/pip" wheel /io/ -w wheelhouse/

diff --git a/.meta.toml b/.meta.toml
@@ -2,15 +2,15 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "3cabefa1ea66c0536869c1e82ce5c94cdbff5f34"
+commit-id = "3ac5baa87d0a86d774b59d62aad2ad4f91b1433f"
 
 [python]
 with-appveyor = true
 with-windows = false
 with-pypy = true
 with-legacy-python = true
-with-docs = false
 with-sphinx-doctests = false
+with-future-python = true
 
 [tox]
 use-flake8 = true

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,7 +5,7 @@
 4.5.2 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Add support for Python 3.10 (as of beta 3).
 
 
 4.5.1 (2021-06-11)

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,9 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
-# Currently the builds use @dataflake's Appveyor account.  The PyPI token belongs
-# to zope.wheelbuilder, which is managed by @mgedmin and @dataflake.
 environment:
-
+  # Currently the builds use @dataflake's Appveyor account.  The PyPI token
+  # belongs to zope.wheelbuilder, managed by @mgedmin and @dataflake.
+
   global:
     TWINE_USERNAME: __token__
     TWINE_PASSWORD:
@@ -22,6 +22,10 @@ environment:
     - python: 38-x64
     - python: 39
     - python: 39-x64
+    # `multibuild` cannot install non-final versions as they are not on
+    # ftp.python.org, so we skip Python 3.10 until its final release:
+    # - python: 310
+    # - python: 310-x64
 
 install:
   - "SET PYTHONVERSION=%PYTHON%"

diff --git a/tox.ini b/tox.ini
@@ -10,6 +10,7 @@ envlist =
     py37,py37-pure
     py38,py38-pure
     py39,py39-pure
+    py310,py310-pure
     pypy
     pypy3
     coverage