Merge branch 'master' into merge-collective.xmltestreport

zopefoundation · Jan 25, 2024 · fa6227d · fa6227d
2 parents d4436e6 + 5fef8a5
commit fa6227d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -29,7 +29,8 @@ jobs:
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
         - ["3.12",  "py312"]
-        - ["pypy-3.9", "pypy3"]
+        - ["3.13.0-alpha - 3.13.0",  "py313"]
+        - ["pypy-3.10", "pypy3"]
         - ["3.9",   "docs"]
         - ["3.9",   "coverage"]
         - ["3.7",   "py37-subunit"]
@@ -49,13 +50,13 @@ 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@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.config[0] }}
     - name: Pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}

diff --git a/.meta.toml b/.meta.toml
@@ -2,14 +2,14 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "6f8d8c51"
+commit-id = "08a3cc69"
 
 [python]
 with-pypy = true
 with-docs = true
 with-sphinx-doctests = false
 with-windows = true
-with-future-python = false
+with-future-python = true
 with-macos = false
 
 [coverage]

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,7 +5,13 @@
 6.3 (unreleased)
 ================
 
-- Work around Python 3.12 no longer calling ``startTest`` for skipped tests
+- Add support for Python 3.13a3.
+
+
+6.2.1 (2023-12-22)
+==================
+
+- Work around Python 3.12.1+ no longer calling ``startTest`` for skipped tests
   (`#157 <https://github.com/zopefoundation/zope.testrunner/issues/157>_`).
 
 - Add new `--xml path` option to write `JUnit`-like XML reports.

diff --git a/setup.py b/setup.py
@@ -153,6 +153,7 @@ def read(*names):
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Software Development :: Libraries :: Python Modules",

diff --git a/src/zope/testrunner/tests/test_threadsupport.py b/src/zope/testrunner/tests/test_threadsupport.py
@@ -11,9 +11,9 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+from _thread import start_new_thread
 from threading import Lock
 from threading import Thread
-from threading import _start_new_thread
 from time import sleep
 from unittest import TestCase
 from unittest import skipUnless
@@ -43,7 +43,7 @@ def __init__(self, name):
 
 class DummyThread(ThreadMixin):
     def start(self):
-        _start_new_thread(self.run, ())
+        start_new_thread(self.run, ())
 
 
 class Tests(TestCase):

diff --git a/tox.ini b/tox.ini
@@ -11,6 +11,7 @@ envlist =
     py310
     py311
     py312
+    py313
     pypy3
     docs
     coverage
@@ -20,6 +21,7 @@ envlist =
 usedevelop = true
 package = wheel
 wheel_build_env = .pkg
+pip_pre = py313: true
 deps =
 setenv =
     py312: VIRTUALENV_PIP=23.1.2
@@ -40,6 +42,7 @@ deps =
     check-manifest
     check-python-versions >= 0.20.0
     wheel
+commands_pre =
 commands =
     check-manifest
     check-python-versions