- add support for Python 3.12 and use latest meta/config

dataflake · Jan 3, 2024 · 7919ef8 · 7919ef8
1 parent 16885f2
commit 7919ef8
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,12 +20,14 @@ jobs:
         - ["ubuntu", "ubuntu-20.04"]
         config:
         # [Python version, tox env]
+        - ["3.9",   "release-check"]
         - ["3.9",   "lint"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
+        - ["3.12",  "py312"]
         - ["3.9",   "docs"]
         - ["3.9",   "coverage"]
 

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 = "e5c611fb"
+commit-id = "acd8d239"
 
 [python]
 with-windows = false
@@ -20,6 +20,7 @@ fail-under = 95
 
 [manifest]
 additional-rules = [
+    "include *.yaml",
     "recursive-include src *.in",
     "recursive-include src *.txt",
     "recursive-include src *.zcml",

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,25 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+  - requirements: docs/requirements.txt
+  - method: pip
+    path: .
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,9 +1,11 @@
 Changelog
 =========
 
-2.1 (unreleased)
+2.1 (2024-01-03)
 ----------------
 
+- Add support for Python 3.12.
+
 
 2.0 (2023-02-02)
 ----------------

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -12,6 +12,7 @@ recursive-include docs *.txt
 recursive-include docs Makefile
 
 recursive-include src *.py
+include *.yaml
 recursive-include src *.in
 recursive-include src *.txt
 recursive-include src *.zcml
diff --git a/setup.cfg b/setup.cfg
@@ -19,7 +19,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources, pytz
+known_third_party = docutils, pkg_resources, pytz
 known_zope =
 known_first_party =
 default_section = ZOPE

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def read(*rnames):
 
 setup(
     name='dataflake.wsgi.cheroot',
-    version='2.1.dev0',
+    version='2.1',
     url='https://github.com/dataflake/dataflake.wsgi.cheroot',
     project_urls={
         'Documentation': 'https://dataflakewsgicheroot.readthedocs.io',

diff --git a/tox.ini b/tox.ini
@@ -3,12 +3,14 @@
 [tox]
 minversion = 3.18
 envlist =
+    release-check
     lint
     py37
     py38
     py39
     py310
     py311
+    py312
     docs
     coverage
 
@@ -17,10 +19,29 @@ skip_install = true
 deps =
     zc.buildout >= 3.0.1
     wheel > 0.37
+setenv =
+    py312: VIRTUALENV_PIP=23.1.2
+    py312: PIP_REQUIRE_VIRTUALENV=0
 commands_pre =
     {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =
-    {envdir}/bin/test {posargs:-cv}
+    {envbindir}/test {posargs:-cv}
+[testenv:release-check]
+description = ensure that the distribution is ready to release
+basepython = python3
+skip_install = true
+deps =
+    twine
+    build
+    check-manifest
+    check-python-versions >= 0.20.0
+    wheel
+commands_pre =
+commands =
+    check-manifest
+    check-python-versions
+    python -m build --sdist --no-isolation
+    twine check dist/*
 
 [testenv:lint]
 basepython = python3
@@ -31,11 +52,7 @@ allowlist_externals =
 commands =
     isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
     flake8 {toxinidir}/src {toxinidir}/setup.py
-    check-manifest
-    check-python-versions
 deps =
-    check-manifest
-    check-python-versions
     flake8
     isort
     # Useful flake8 plugins that are Python and Plone specific:
@@ -64,13 +81,14 @@ commands =
 basepython = python3
 skip_install = true
 allowlist_externals =
+    {[testenv]allowlist_externals}
     mkdir
 deps =
     {[testenv]deps}
     coverage
 commands =
     mkdir -p {toxinidir}/parts/htmlcov
-    coverage run {envdir}/bin/test {posargs:-cv}
+    coverage run {envbindir}/test {posargs:-cv}
     coverage html
     coverage report -m --fail-under=95