Add support for Python 3.10

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy3]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
 
     steps:
       - uses: actions/checkout@v2

NEWS

@@ -3,6 +3,15 @@ testtools NEWS
 
 Changes and improvements to testtools_, grouped by release.
 
+NEXT
+~~~~
+
+Improvements
+------------
+
+* Add support for Python 3.10.
+  (Jürgen Gmach)
+
 2.5.0
 ~~~~~
 

scripts/all-pythons

@@ -89,5 +89,5 @@ def now():
 if __name__ == '__main__':
     sys.path.append(ROOT)
     result = TestProtocolClient(sys.stdout)
-    for version in '3.5 3.6 3.7 3.8 3.9'.split():
+    for version in '3.5 3.6 3.7 3.8 3.9 3.10'.split():
         run_for_python(version, result, sys.argv[1:])

setup.cfg

@@ -17,6 +17,7 @@ classifier =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy

testtools/tests/test_testresult.py

@@ -2667,16 +2667,19 @@ def test_syntax_error(self):
         """Syntax errors should still have fancy special-case formatting"""
         if platform.python_implementation() == "PyPy":
             spaces = '           '
+            marker = '^'
         elif sys.version_info >= (3, 10):
             spaces = '        '
+            marker = '^^^'
         else:
             spaces = '          '
+            marker = '^'
         textoutput = self._test_external_case("exec ('f(a, b c)')")
         self.assertIn(self._as_output(
             '  File "<string>", line 1\n'
             '    f(a, b c)\n'
             + ' ' * self._error_on_character +
-            spaces + '^\n'
+            spaces + marker + '\n'
             'SyntaxError: '
             ), textoutput)
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py36,py37,py38,py39,310,pypy3
+envlist = py35,py36,py37,py38,py39,py310,pypy3
 minversion = 1.6
 
 [testenv]