Add support for Python 3.10 + fix lint. (#6)

zopefoundation · Apr 12, 2022 · 52e5f7e · 52e5f7e
1 parent de31003
commit 52e5f7e
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 20 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,14 +20,15 @@ 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"]
-        - ["3.8",   "coverage"]
+        - ["3.10",  "py310"]
+        - ["3.9",   "coverage"]
 
     runs-on: ${{ matrix.os }}-latest
     name: ${{ matrix.config[1] }}

diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,5 @@ lib64
 log/
 parts/
 pyvenv.cfg
+testing.log
 var/
diff --git a/.meta.toml b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "5b60e8235223c5c73427d4cdf66be5fb2cce3cea"
+commit-id = "9a5db8c650c45a439db06e3a7b2b86318006659d"
 
 [python]
 with-pypy = false

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -3,35 +3,35 @@ Changelog
 
 3.3 (unreleased)
 ----------------
-
+- Add support for Python 3.10.
 
 3.2 (2021-03-16)
 ----------------
-- Add support for Python 3.9
+- Add support for Python 3.9.
 
 
 3.1 (2020-02-11)
 ----------------
-- Fix linting
+- Fix linting.
 
-- Change some imports to prevent DeprecationWarnings
+- Change some imports to prevent DeprecationWarnings.
 
 
 3.0 (2019-05-20)
 ----------------
-- Reimplemented using Python's ``email`` module
+- Reimplemented using Python's ``email`` module.
 
-- Added support for Python 3.5, 3.6, 3.7 and 3.8
+- Added support for Python 3.5, 3.6, 3.7 and 3.8.
 
-- Switched documentation to standard ``dtml`` notation
+- Switched documentation to standard ``dtml`` notation.
 
-- Added ``tox`` testing configuration
+- Added ``tox`` testing configuration.
 
-- Full linting
+- Full linting.
 
-- Boosted test coverage to over 90%
+- Boosted test coverage to over 90%.
 
-- Compatible with DocumentTemplate 3.x and Zope 4
+- Compatible with DocumentTemplate 3.x and Zope 4.
 
 
 2.13.0 (2010-07-10)

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

diff --git a/setup.py b/setup.py
@@ -50,6 +50,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',
         'Topic :: Communications :: Email',
       ],

diff --git a/tox.ini b/tox.ini
@@ -10,14 +10,14 @@ envlist =
     py37
     py38
     py39
+    py310
     coverage
 
 [testenv]
 skip_install = true
-# We need to pin setuptools until we have zc.buildout 3.0.
 deps =
-    setuptools < 52
-    zc.buildout
+    zc.buildout >= 3.0.0rc3
+    wheel > 0.37
 commands_pre =
     py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
     !py27-!py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
@@ -32,7 +32,7 @@ allowlist_externals =
     mkdir
 commands =
     isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
-    - flake8 --format=html {toxinidir}/src {toxinidir}/setup.py
+    - flake8 {toxinidir}/src {toxinidir}/setup.py
     flake8 {toxinidir}/src {toxinidir}/setup.py
     check-manifest
     check-python-versions
@@ -41,8 +41,6 @@ deps =
     check-python-versions
     flake8
     isort
-    # helper to generate HTML reports:
-    flake8-html
     # Useful flake8 plugins that are Python and Plone specific:
     flake8-coding
     flake8-debugger