Add support for Python 3.12 and 3.13. (#29)

Drop support for Python 3.7 and 3.8.

Author: icemac

.coveragerc

@@ -4,8 +4,7 @@ source = gocept.testing
 
 [report]
 precision = 2
-# PY2 should be updated to 100 when Python 3 only.
-fail_under = 98
+fail_under = 100
 
 [html]
 directory = coverage-report

.github/workflows/tests.yml

@@ -2,10 +2,7 @@ name: tests
 
 on:
   push:
-    branches: [ main ]
   pull_request:
-    branches: [ main ]
-    type: [ "opened", "reopened", "synchronize" ]
   schedule:
     - cron: '0 12 * * 0'  # run once a week on Sunday
   # Allow to run this workflow manually from the Actions tab
@@ -17,23 +14,24 @@ jobs:
       matrix:
         config:
         # [Python version, tox env]
-        - ["3.7",   "py37"]
-        - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
-        - ["pypy-3.7", "pypy3"]
-        - ["3.9",   "coverage"]
+        - ["3.12",  "py312"]
+        - ["3.13",  "py313"]
+        - ["pypy-3.10", "pypy3"]
+        - ["3.11",   "coverage"]
     runs-on: ubuntu-latest
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.config[0] }}
+        allow-prereleases: true
     - name: Pip cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('setup.*', 'tox.ini') }}

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.5.0
+      rev: v4.6.0
       hooks:
           - id: trailing-whitespace
           - id: end-of-file-fixer
@@ -13,17 +13,17 @@ repos:
           - id: debug-statements
             language_version: python3
     - repo: https://github.com/PyCQA/flake8
-      rev: 6.1.0
+      rev: 7.0.0
       hooks:
           - id: flake8
             language_version: python3
             args: ["--doctests"]
     - repo: https://github.com/hhatto/autopep8
-      rev: v2.0.4
+      rev: v2.1.0
       hooks:
           - id: autopep8
     - repo: https://github.com/PyCQA/isort
-      rev: 5.12.0
+      rev: 5.13.2
       hooks:
       - id: isort
         args: [--filter-files]

CHANGES.rst

@@ -4,7 +4,15 @@ Changelog
 3.1 (unreleased)
 ----------------
 
-- Add support for Python 3.11.
+Backwards incompatible changes
+++++++++++++++++++++++++++++++
+
+- Drop support for Python 3.7, 3.8.
+
+Features
+++++++++
+
+- Add support for Python 3.11, 3.12 and 3.13 (as of beta 1).
 
 
 3.0 (2021-08-26)
@@ -20,7 +28,7 @@ Backwards incompatible changes
 Features
 ++++++++
 
-- Add support for Python 3.8, 3.9 and 3.10 (as of rc.1).
+- Add support for Python 3.8, 3.9 and 3.10 (as of rc.1).
 
 
 2.0.post1 (2018-11-22)

LICENSE.txt

@@ -1,4 +1,5 @@
 Copyright (c) 2011-2021 gocept gmbh & co. kg
+Copyright (c) 2024 Minddistrict
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
 without restriction, including without limitation the rights to use, copy, modify, merge,

README.rst

@@ -2,11 +2,11 @@
 gocept.testing
 ==============
 
-.. image:: https://github.com/gocept/gocept.testing/workflows/tests/badge.svg
-    :target: https://github.com/gocept/gocept.testing/actions?query=workflow%3Atests
+.. image:: https://github.com/minddistrict/gocept.testing/workflows/tests/badge.svg
+    :target: https://github.com/minddistrict/gocept.testing/actions?query=workflow%3Atests
 
-.. image:: https://coveralls.io/repos/github/gocept/gocept.testing/badge.svg
-    :target: https://coveralls.io/github/gocept/gocept.testing
+.. image:: https://coveralls.io/repos/github/minddistrict/gocept.testing/badge.svg
+    :target: https://coveralls.io/github/minddistrict/gocept.testing
 
 
 This package collects various helpers for writing tests.
@@ -18,7 +18,7 @@ assertEllipsis
 ==============
 
 An assertion which is very helpful when using Testbrowser with
-unittest.TestCase (instead of doctests).
+``unittest.TestCase`` (instead of ``doctest``).
 
 Some examples::
 
@@ -75,7 +75,7 @@ mock patch context
 
 ``gocept.testing.mock.Patches`` collects `mock`_ patches that are valid for the
 whole TestCase, and resets them all in one go in tearDown (this is pending
-incluion upstream as ``mock.patcher()``, see `issue 30`_)::
+inclusion upstream as ``mock.patcher()``, see `issue 30`_)::
 
     class MyTest(unittest.TestCase):
 
@@ -98,7 +98,7 @@ Note that ``gocept.testing`` does not declare a dependency on ``mock`` to be as
 lightweight as possible, so clients need to do that themselves.
 
 If you want to save typing, you can mix ``gocept.testing.mock.PatchHelper``
-into your TestCase, it defines a setUp method that instatiates ``Patches`` and
+into your TestCase, it defines a setUp method that instantiates ``Patches`` and
 a tearDown that calls ``reset()`` on it.
 
 

setup.py

@@ -5,9 +5,9 @@
 setup(
     name='gocept.testing',
     version='3.1.dev0',
-    author='gocept <mail at gocept dot com>',
-    author_email='mail@gocept.com',
-    url='https://github.com/gocept/gocept.testing',
+    author='minddistrict <mail at minddistrict dot com>',
+    author_email='mail@minddistrict.com',
+    url='https://github.com/minddistrict/gocept.testing',
     description="""\
 A collection of test helpers, additional assertions, and the like.""",
     classifiers=[
@@ -19,11 +19,11 @@
         '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',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Programming Language :: Python :: Implementation',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
@@ -33,18 +33,16 @@
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: Testing',
     ],
-    long_description=(
-        open('README.rst').read()
-        + '\n\n'
-        + open('CHANGES.rst').read()),
+    long_description=(open('README.rst').read() + '\n\n' +
+                      open('CHANGES.rst').read()),
     packages=find_packages('src'),
     package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,
     license='MIT',
     keywords="testing unittest assertions",
     namespace_packages=['gocept'],
-    python_requires='>=3.7',
+    python_requires='>=3.9',
     install_requires=[
         'setuptools',
     ],

src/gocept/testing/assertion.py

@@ -22,24 +22,23 @@ def ellipsis_match(expected, actual):
 class Ellipsis:
     """Assertion helper that provides doctest-style ellipsis matching.
 
-    Inherit from this class in additition to unittest.TestCase.
+    Inherit from this class in addition to unittest.TestCase.
     """
 
     def assertEllipsis(self, expected, actual):
         if ellipsis_match(expected, actual):
             return True
         # report ndiff
         engine = difflib.Differ(charjunk=difflib.IS_CHARACTER_JUNK)
-        diff = list(engine.compare(expected.splitlines(True),
-                                   actual.splitlines(True)))
+        diff = list(
+            engine.compare(expected.splitlines(True), actual.splitlines(True)))
         kind = 'ndiff with -expected +actual'
         diff = [line.rstrip() + '\n' for line in diff]
         self.fail('Differences (%s):\n' % kind + ''.join(diff))
 
     def assertNotEllipsis(self, expected, actual):
         if ellipsis_match(expected, actual):
-            self.fail(
-                'Value unexpectedly matches expression %r.' % expected)
+            self.fail('Value unexpectedly matches expression %r.' % expected)
 
 
 class Exceptions:
@@ -64,9 +63,8 @@ def __exit__(self, exc_type, exc_value, tb):
         if exc_type is None:
             return True
         exc_name = exc_type.__name__
-        message = (
-            'Unexpectedly raised %s, original traceback follows:\n'
-            % exc_name)
+        message = ('Unexpectedly raised %s, original traceback follows:\n' %
+                   exc_name)
         # cut off "Traceback: (most recent call last)" and the original
         #  message, since we're printing that ourselves
         stack = ''.join(

tox.ini

@@ -1,10 +1,10 @@
 [tox]
 envlist =
-    py37,
-    py38,
     py39,
     py310,
     py311,
+    py312,
+    py313,
     pypy3,
     coverage,
 minversion = 1.6
@@ -21,6 +21,5 @@ deps =
     {[testenv]deps}
     pytest-cov
     coverage
-    coverage-python-version
 commands =
     py.test --cov=src --cov-report=html []