Add support for Python 3.10.

Drop support for Python 2, and 3.6.

Author: Michael Howitz

.github/workflows/tests.yml

@@ -17,12 +17,12 @@ jobs:
       matrix:
         config:
         # [Python version, tox env]
-        - ["2.7",   "py27"]
-        - ["3.6",   "py36"]
         - ["3.7",   "py37"]
         - ["3.8",   "py38"]
-        - ["pypy3", "pypy3"]
-        - ["3.8",   "coverage"]
+        - ["3.9",   "py39"]
+        - ["3.10.0-rc.1", "py310"]
+        - ["pypy-3.7", "pypy3"]
+        - ["3.9",   "coverage"]
     runs-on: ubuntu-latest
     name: ${{ matrix.config[1] }}
     steps:

CHANGES.rst

@@ -1,17 +1,20 @@
 Changelog
 =========
 
-2.1 (unreleased)
+3.0 (unreleased)
 ----------------
 
-- Migrate to Github.
+Backwards incompatible changes
+++++++++++++++++++++++++++++++
 
-- Test with Python 3.8.
 - Change license form ZPL to MIT.
 
-- Stop testing with Python 3.4 and 3.5
+- Drop support for Python 2, 3.4, 3.5 and 3.6
 
-- Use Github actions as CI.
+Features
+++++++++
+
+- Add support for Python 3.8, 3.9 and 3.10 (as of rc.1).
 
 
 2.0.post1 (2018-11-22)

setup.cfg

@@ -1,5 +1,5 @@
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [isort]
 lines_between_sections = 0

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='gocept.testing',
-    version='2.1.dev0',
+    version='3.0.dev0',
     author='gocept <mail at gocept dot com>',
     author_email='[email protected]',
     url='https://github.com/gocept/gocept.testing',
@@ -18,12 +18,12 @@
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
@@ -44,15 +44,8 @@
     license='MIT',
     keywords="testing unittest assertions",
     namespace_packages=['gocept'],
+    python_requires='>=3.7',
     install_requires=[
         'setuptools',
     ],
-    extras_require=dict(
-        test=[
-            'mock ; python_version<"3.3"',
-        ],
-        mock=[
-            'mock ; python_version<"3.3"',
-        ],
-    ),
 )

src/gocept/testing/assertion.py

@@ -1,16 +1,11 @@
 import difflib
 import doctest
-import sys
 import traceback
 
 
 def text(arg):
-    if sys.version_info < (3,):
-        if isinstance(arg, str):
-            arg = arg.decode('utf-8')
-    else:
-        if not isinstance(arg, str):
-            arg = arg.decode('utf-8')
+    if not isinstance(arg, str):
+        arg = arg.decode('utf-8')
     return arg
 
 
@@ -24,7 +19,7 @@ def ellipsis_match(expected, actual):
     return doctest._ellipsis_match(norm_expected, norm_actual)
 
 
-class Ellipsis(object):
+class Ellipsis:
     """Assertion helper that provides doctest-style ellipsis matching.
 
     Inherit from this class in additition to unittest.TestCase.
@@ -47,7 +42,7 @@ def assertNotEllipsis(self, expected, actual):
                 'Value unexpectedly matches expression %r.' % expected)
 
 
-class Exceptions(object):
+class Exceptions:
 
     def assertNothingRaised(self, callable=None, *args, **kw):
         context = AssertNothingRaisedContext(self)
@@ -57,7 +52,7 @@ def assertNothingRaised(self, callable=None, *args, **kw):
             callable(*args, **kw)
 
 
-class AssertNothingRaisedContext(object):
+class AssertNothingRaisedContext:
 
     def __init__(self, test_case):
         self.failureException = test_case.failureException
@@ -76,16 +71,16 @@ def __exit__(self, exc_type, exc_value, tb):
         #  message, since we're printing that ourselves
         stack = ''.join(
             traceback.format_exception(exc_type, exc_value, tb)[1:-1])
-        text = message + stack + 'Unexpected %s: %s' % (exc_name, exc_value)
+        text = message + stack + f'Unexpected {exc_name}: {exc_value}'
         raise self.failureException(text)
 
 
-class String(object):
+class String:
 
     def assertStartsWith(self, needle, haystack):
         if not haystack.startswith(needle):
-            self.fail('%r does not start with %r.' % (haystack, needle))
+            self.fail(f'{haystack!r} does not start with {needle!r}.')
 
     def assertEndsWith(self, needle, haystack):
         if not haystack.endswith(needle):
-            self.fail('%r does not end with %r.' % (haystack, needle))
+            self.fail(f'{haystack!r} does not end with {needle!r}.')

src/gocept/testing/fixture.py

@@ -2,13 +2,13 @@
 import tempfile
 
 
-class TempDir(object):
+class TempDir:
     """Offer a temporary directory."""
 
     def setUp(self):
-        super(TempDir, self).setUp()
+        super().setUp()
         self.tmpdir = tempfile.mkdtemp()
 
     def tearDown(self):
-        super(TempDir, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.tmpdir)

src/gocept/testing/mock.py

@@ -1,13 +1,7 @@
-from __future__ import absolute_import
+from unittest import mock
 
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
-
-class Patches(object):
+class Patches:
 
     def __init__(self):
         self.patches = []
@@ -33,7 +27,7 @@ def reset(self):
         self.patches[:] = []
 
 
-class Assertions(object):
+class Assertions:
 
     def assertCalledWith(self, mock, *args, **kw):
         return mock.assert_called_with(*args, **kw)
@@ -45,12 +39,12 @@ def __get__(self, instance, class_):
         return self()
 
 
-class PatchHelper(object):
+class PatchHelper:
 
     def setUp(self):
-        super(PatchHelper, self).setUp()
+        super().setUp()
         self.patches = Patches()
 
     def tearDown(self):
         self.patches.reset()
-        super(PatchHelper, self).tearDown()
+        super().tearDown()

src/gocept/testing/mtime.py

@@ -3,7 +3,7 @@
 import os.path
 
 
-class Newer(object):
+class Newer:
 
     source_ext = NotImplemented
     target_ext = NotImplemented
@@ -33,13 +33,13 @@ def _check_files_in_list(self, path, names):
 
             self.assertTrue(
                 os.path.exists(target_path),
-                "%s does not exist.\n%s" % (target_filename, self.message))
+                f"{target_filename} does not exist.\n{self.message}")
             target_mtime = os.path.getmtime(target_path)
             file_mtime = os.path.getmtime(filepath)
             delta = file_mtime - target_mtime
             self.assertTrue(
                 delta < self.delta,
-                "%s is out of date: %s (%s) > %s (%s), Delta: %s.\n%s" % (
+                "{} is out of date: {} ({}) > {} ({}), Delta: {}.\n{}".format(
                     target_path, self.to_str(file_mtime), filename,
                     self.to_str(target_mtime), target_filename,
                     delta, self.message))

src/gocept/testing/patch.py

@@ -1,7 +1,7 @@
 import contextlib
 
 
-class Patches(object):
+class Patches:
     # XXX Maybe this should be a context manager, too.
 
     def __init__(self):

src/gocept/testing/tests/test_assertion.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 import gocept.testing.assertion
 import sys
 import unittest
@@ -27,12 +26,12 @@ def test_unicode_matches_utf8(self):
         # helpful for zope.testbrowser
         with self.assertNothingRaised():
             self.assertEllipsis(
-                u'...bar...', u'föö bar baz'.encode('utf-8'))
+                '...bar...', 'föö bar baz'.encode())
 
     def test_utf8_matches_unicode(self):
         with self.assertNothingRaised():
             self.assertEllipsis(
-                u'...bar...'.encode('utf-8'), u'föö bar baz')
+                b'...bar...', 'föö bar baz')
 
     def test_inverse_assertion(self):
         with self.assertNothingRaised():

src/gocept/testing/tests/test_fixture.py

@@ -7,7 +7,7 @@ class TempDirTest(gocept.testing.fixture.TempDir, unittest.TestCase):
     """Testing ..fixture.TempDir."""
 
     def setUp(self):
-        super(TempDirTest, self).setUp()
+        super().setUp()
         with open(os.path.join(self.tmpdir, 'foo'), 'w') as f:
             f.write('bar')
 

src/gocept/testing/tests/test_mock.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from gocept.testing.mock import mock
 import gocept.testing.mock
 import sys
@@ -73,7 +72,7 @@ def test_should_delegate_to_mock_method(self):
         self.assertCalledWith(dummy, True)
 
 
-class Dummy(object):
+class Dummy:
 
     @property
     def foo(self):
@@ -97,7 +96,7 @@ class PatchHelperTests(gocept.testing.mock.PatchHelper, unittest.TestCase):
     def setUp(self):
         """Has patches after setup."""
         assert hasattr(self, 'patches') is False
-        super(PatchHelperTests, self).setUp()
+        super().setUp()
         assert hasattr(self, 'patches') is True
         self.foo = mock.sentinel.foo
         self.bar = mock.sentinel.bar
@@ -114,5 +113,5 @@ def tearDown(self):
         # still the same as in test
         assert self.bar == self.subject.foo
         # it was re-setted.
-        super(PatchHelperTests, self).tearDown()
+        super().tearDown()
         assert self.foo == self.subject.foo

src/gocept/testing/tests/test_patch.py

@@ -16,7 +16,7 @@ def test_changes_attribute_and_resets(self):
         self.assertEqual(mock.sentinel.foo, subject.foo)
 
     def test_callable_attribute_called_and_reset(self):
-        class Dummy(object):
+        class Dummy:
             def foo(self, arg):
                 self.arg = arg
 

tox.ini

@@ -1,11 +1,9 @@
 [tox]
 envlist =
-    py27,
-    py35,
-    py36,
     py37,
     py38,
-    pypy,
+    py39,
+    py310,
     pypy3,
     coverage,
 minversion = 1.6