Support Python 3.15 (#61)

* Configuring for pure-python

* Deprecate zope.testing.doctestcase in favour of plain doctest.

Points users to doctest.DocTestSuite/DocFileSuite as the migration path.

Author: icemac

.github/workflows/pre-commit.yml

@@ -21,7 +21,7 @@ jobs:
     name: linting
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: actions/setup-python@v6
       with:
         python-version: '3.13'

.github/workflows/tests.yml

@@ -30,6 +30,7 @@ jobs:
         - ["3.12", "py312"]
         - ["3.13", "py313"]
         - ["3.14", "py314"]
+        - ["3.15", "py315"]
         - ["pypy-3.11", "pypy3"]
         - ["3.11", "docs"]
         - ["3.11", "coverage"]
@@ -42,12 +43,12 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.os[0] }}-${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         persist-credentials: false
     - name: Install uv + caching
-      # astral/setup-uv@7.2.0
-      uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b
+      # astral/setup-uv@8.2.0
+      uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39
       with:
         enable-cache: true
         cache-dependency-glob: |
@@ -63,3 +64,32 @@ jobs:
         uvx coveralls --service=github
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build package artifacts
+      if: >
+        matrix.os[0] == 'ubuntu'
+        && matrix.config[1] == 'py314'
+      run: |
+        rm -f dist/*
+        pip install -U packaging "setuptools >= 78.1.1,< 82" wheel twine
+        python setup.py sdist
+        python setup.py bdist_wheel
+
+    - name: Upload package wheel
+      if: >
+        matrix.os[0] == 'ubuntu'
+        && matrix.config[1] == 'py314'
+      uses: actions/upload-artifact@v7
+      with:
+        name: zope.testing.whl
+        path: dist/*whl
+
+    - name: Upload package source distribution
+      if: >
+        matrix.os[0] == 'ubuntu'
+        && matrix.config[1] == 'py314'
+      uses: actions/upload-artifact@v7
+      with:
+        name: zope.testing.tar.gz
+        path: dist/*gz
+

.gitignore

@@ -28,5 +28,6 @@ lib64
 log/
 parts/
 pyvenv.cfg
+share/
 testing.log
 var/

.meta.toml

@@ -2,15 +2,16 @@
 # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python
 [meta]
 template = "pure-python"
-commit-id = "f6df9072"
+commit-id = "6a771177"
 
 [python]
 with-pypy = true
 with-docs = true
 with-sphinx-doctests = true
 with-windows = true
-with-future-python = false
+with-future-python = true
 with-macos = false
+with-free-threaded-python = false
 
 [coverage]
 fail-under = 97

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 minimum_pre_commit_version: '3.6'
 repos:
   - repo: https://github.com/pycqa/isort
-    rev: "7.0.0"
+    rev: "8.0.1"
     hooks:
     - id: isort
   - repo: https://github.com/hhatto/autopep8
@@ -20,6 +20,7 @@ repos:
     rev: 0.4.3
     hooks:
     - id: teyit
+      language_version: python3.13
   - repo: https://github.com/PyCQA/flake8
     rev: "7.3.0"
     hooks:

CHANGES.rst

@@ -5,6 +5,11 @@
 6.2 (unreleased)
 ================
 
+- Add support for Python 3.15.
+
+- Deprecate ``zope.testing.doctestcase`` in favour of plain ``doctest``
+  (e.g. ``doctest.DocTestSuite`` or ``doctest.DocFileSuite``).
+
 - Move package metadata from setup.py to pyproject.toml.
 
 

pyproject.toml

@@ -3,12 +3,11 @@
 
 [build-system]
 requires = [
-    "setuptools >= 78.1.1,< 81",
+    "setuptools >= 78.1.1,< 82",
     "wheel",
 ]
 build-backend = "setuptools.build_meta"
 
-
 [project]
 name = "zope.testing"
 version = "6.2.dev0"

setup.cfg

@@ -1,6 +1,5 @@
 # Generated with zope.meta (https://zopemeta.readthedocs.io/) from:
 # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/pure-python
-
 [flake8]
 doctests = 1
 

src/zope/testing/doctestcase.py

@@ -3,10 +3,21 @@
 """
 import doctest
 import inspect
+import io
 import os
 import re
 import sys
 import types
+import unittest
+import warnings
+
+
+warnings.warn(
+    'zope.testing.doctestcase is deprecated and will be removed in a '
+    'future release. Use plain doctest (e.g. doctest.DocTestSuite or '
+    'doctest.DocFileSuite) instead.',
+    DeprecationWarning,
+    stacklevel=2)
 
 
 __all__ = [
@@ -203,11 +214,38 @@ def name_from_path(path):
 
 def _run_test(self, test, globs, name, path,
               optionflags, checker, testname='self', lineno=0):
+    # This deliberately avoids DocTestCase.run()/.runTest(), which (as of
+    # Python 3.15) report each example as a separate subtest of the
+    # enclosing unittest result, rather than raising on failure. We want
+    # the whole doctest to be run in one go, with any failures raised
+    # here so that they become a failure of *this* test.
     globs.update(getattr(self, 'globs', ()))
     globs[testname] = self
     optionflags |= doctest.IGNORE_EXCEPTION_DETAIL
-    doctest.DocTestCase(
-        _parser.get_doctest(test, globs, name, path, lineno),
-        optionflags=optionflags,
-        checker=checker,
-    ).runTest()
+    if not (optionflags & doctest.REPORTING_FLAGS):
+        optionflags |= getattr(doctest, '_unittest_reportflags', 0)
+
+    dtest = _parser.get_doctest(test, globs, name, path, lineno)
+    runner = doctest.DocTestRunner(
+        optionflags=optionflags, checker=checker, verbose=False)
+    out = io.StringIO()
+    old_stdout = sys.stdout
+    try:
+        runner.DIVIDER = "-" * 70
+        results = runner.run(dtest, out=out.write, clear_globs=False)
+        # TestResults.skipped was only added in Python 3.13.
+        if hasattr(results, 'skipped') and (
+                results.skipped == results.attempted):
+            raise unittest.SkipTest("all examples were skipped")
+    finally:
+        sys.stdout = old_stdout
+
+    if results.failed:
+        lineno = ('unknown line number' if dtest.lineno is None
+                  else str(dtest.lineno))
+        lname = dtest.name.rsplit('.', 1)[-1]
+        raise self.failureException(
+            'Failed doctest test for %s\n'
+            '  File "%s", line %s, in %s\n\n%s'
+            % (dtest.name, dtest.filename, lineno, lname,
+               out.getvalue().rstrip('\n')))

tox.ini

@@ -10,6 +10,7 @@ envlist =
     py312
     py313
     py314
+    py315
     pypy3
     docs
     coverage
@@ -18,8 +19,9 @@ envlist =
 usedevelop = true
 package = wheel
 wheel_build_env = .pkg
+pip_pre = py315: true
 deps =
-    setuptools >= 78.1.1,< 81
+    setuptools >= 78.1.1,< 82
 commands =
     zope-testrunner --test-path=src {posargs:-vc}
     sphinx-build -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
@@ -37,12 +39,12 @@ description = ensure that the distribution is ready to release
 basepython = python3
 skip_install = true
 deps =
-    setuptools >= 78.1.1,< 81
+    setuptools >= 78.1.1,< 82
     wheel
     twine
     build
     check-manifest
-    check-python-versions >= 0.20.0
+    check-python-versions >= 0.24.2
     wheel
 commands_pre =
 commands =