Drop support for Python 3.7 + fix for Sphinx 8 (#49)

Author: icemac

.github/workflows/tests.yml

@@ -17,38 +17,37 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ["ubuntu", "ubuntu-20.04"]
+        - ["ubuntu", "ubuntu-latest"]
         - ["windows", "windows-latest"]
         config:
         # [Python version, tox env]
-        - ["3.9",   "release-check"]
-        - ["3.9",   "lint"]
-        - ["3.7",   "py37"]
+        - ["3.11",  "release-check"]
+        - ["3.11",  "lint"]
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
         - ["3.12",  "py312"]
-        - ["pypy-3.9", "pypy3"]
-        - ["3.9",   "docs"]
-        - ["3.9",   "coverage"]
+        - ["pypy-3.10", "pypy3"]
+        - ["3.11",   "docs"]
+        - ["3.11",   "coverage"]
         exclude:
-          - { os: ["windows", "windows-latest"], config: ["3.9",   "release-check"] }
-          - { os: ["windows", "windows-latest"], config: ["3.9",   "lint"] }
-          - { os: ["windows", "windows-latest"], config: ["3.9",   "docs"] }
-          - { os: ["windows", "windows-latest"], config: ["3.9",   "coverage"] }
+          - { os: ["windows", "windows-latest"], config: ["3.11",  "release-check"] }
+          - { os: ["windows", "windows-latest"], config: ["3.11",  "lint"] }
+          - { os: ["windows", "windows-latest"], config: ["3.11",  "docs"] }
+          - { os: ["windows", "windows-latest"], config: ["3.11",  "coverage"] }
 
     runs-on: ${{ matrix.os[1] }}
     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') }}
@@ -60,7 +59,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install tox
     - name: Test
+      if: ${{ !startsWith(runner.os, 'Mac') }}
       run: tox -e ${{ matrix.config[1] }}
+    - name: Test (macOS)
+      if: ${{ startsWith(runner.os, 'Mac') }}
+      run: tox -e ${{ matrix.config[1] }}-universal2
     - name: Coverage
       if: matrix.config[1] == 'coverage'
       run: |

.meta.toml

@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "1a1f5e27"
+commit-id = "b93682fc"
 
 [python]
 with-pypy = true

CHANGES.rst

@@ -2,8 +2,10 @@
  Changes
 =========
 
-5.0.2 (unreleased)
-==================
+5.1 (unreleased)
+================
+
+- Drop support for Python 3.7.
 
 - Add support for Python 3.12
 

docs/conf.py

@@ -15,6 +15,7 @@
 import sys
 import os
 import pkg_resources
+
 sys.path.append(os.path.abspath('../src'))
 rqmt = pkg_resources.require('zope.testing')[0]
 # Import and document the pure-python versions of things; they tend to have better
@@ -47,7 +48,7 @@
 templates_path = ['_templates']
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = {'.rst': 'restructuredtext'}
 
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
@@ -57,7 +58,7 @@
 
 # General information about the project.
 project = 'zope.testing'
-copyright = '2012-2021, Zope Foundation contributors'
+copyright = '2012-2024, Zope Foundation contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -102,7 +103,6 @@
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
-
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
@@ -182,18 +182,17 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'zopetestingdoc'
 
-
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 }
 
 # pdflatex can't handle Cyrillic out of the box, but xetext/lualatex should be
@@ -203,8 +202,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'zopetesting.tex', 'zope.testing Documentation',
-   'Zope Foundation contributors', 'manual'),
+    ('index', 'zopetesting.tex', 'zope.testing Documentation',
+     'Zope Foundation contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -227,29 +226,25 @@
 # If false, no module index is generated.
 #latex_domain_indices = True
 
-
 # -- Options for manual page output --------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'zopetesting', 'zope.testing Documentation',
-     ['Zope Foundation contributors'], 1)
-]
+man_pages = [('index', 'zopetesting', 'zope.testing Documentation',
+              ['Zope Foundation contributors'], 1)]
 
 # If true, show URL addresses after external links.
 #man_show_urls = False
 
-
 # -- Options for Texinfo output ------------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'zopetesting', 'zope.testing Documentation',
-   'Zope Foundation contributors', 'zopetesting', 'One line description of project.',
-   'Miscellaneous'),
+    ('index', 'zopetesting', 'zope.testing Documentation',
+     'Zope Foundation contributors', 'zopetesting',
+     'A number of testing frameworks.', 'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -261,11 +256,11 @@
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
 
-
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'https://docs.python.org/': None,
-    'https://zopetestbrowser.readthedocs.io/en/latest/': None,
+    'python': ('https://docs.python.org/', None),
+    'zopetestbrowser':
+    ('https://zopetestbrowser.readthedocs.io/en/latest/', None),
 }
 
 # Sphinx 1.8+ prefers this to `autodoc_default_flags`. It's documented that

setup.cfg

@@ -1,7 +1,5 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
-[bdist_wheel]
-universal = 0
 
 [flake8]
 doctests = 1

setup.py

@@ -33,7 +33,7 @@ def read(*rnames):
 
 setup(
     name='zope.testing',
-    version='5.0.2.dev0',
+    version='5.1.dev0',
     url='https://github.com/zopefoundation/zope.testing',
     license='ZPL 2.1',
     description='Zope testing helpers',
@@ -47,7 +47,6 @@ def read(*rnames):
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
@@ -68,7 +67,7 @@ def read(*rnames):
     ],
     package_dir={'': 'src'},
     namespace_packages=['zope'],
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     install_requires=[
         'setuptools',
     ],

src/zope/testing/testrunner.py

@@ -1,14 +1,17 @@
 import warnings
 
 
-warnings.warn('zope.testing.testrunner is deprecated in favour of '
-              'zope.testrunner', DeprecationWarning, stacklevel=2)
+warnings.warn(
+    'zope.testing.testrunner is deprecated in favour of '
+    'zope.testrunner',
+    DeprecationWarning,
+    stacklevel=2)
 
 try:
     import zope.testing
     from zope import testrunner
 
     # Now replace this module with the right one:
     zope.testing.testrunner = testrunner
-except ImportError:
+except ModuleNotFoundError:
     pass

tox.ini

@@ -5,7 +5,6 @@ minversion = 3.18
 envlist =
     release-check
     lint
-    py37
     py38
     py39
     py310
@@ -20,6 +19,7 @@ usedevelop = true
 package = wheel
 wheel_build_env = .pkg
 deps =
+    setuptools < 69
 setenv =
     py312: VIRTUALENV_PIP=23.1.2
     py312: PIP_REQUIRE_VIRTUALENV=0
@@ -29,6 +29,7 @@ commands =
 extras =
     test
     docs
+
 [testenv:release-check]
 description = ensure that the distribution is ready to release
 basepython = python3
@@ -39,9 +40,10 @@ deps =
     check-manifest
     check-python-versions >= 0.20.0
     wheel
+commands_pre =
 commands =
     check-manifest
-    check-python-versions
+    check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml
     python -m build --sdist --no-isolation
     twine check dist/*
 
@@ -83,7 +85,7 @@ commands =
     coverage run -m zope.testrunner --test-path=src {posargs:-vc}
     coverage run -a -m sphinx -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
     coverage html --ignore-errors
-    coverage report --ignore-errors --show-missing --fail-under=97
+    coverage report --show-missing --fail-under=97
 
 [coverage:run]
 branch = True
@@ -95,6 +97,7 @@ omit =
 
 [coverage:report]
 precision = 2
+ignore_errors = True
 exclude_lines =
     pragma: no cover
     pragma: nocover