Merge ~athos-ribeiro/ubuntu/+source/python-testtools:python-310 into ubuntu/+source/python-testtools:ubuntu/devel

[Athos Ribeiro]

This is a fix for https://bugs.launchpad.net/ubuntu/+source/python-testtools/+bug/1951877 to add Python 3.10 support to this package.

This package is available in a PPA at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/python-testtools-310-support/+packages

I ran the dep8 tests for this package locally. This is the results summary:

autopkgtest [17:33:53]: @@@@@@@@@@@@@@@@@@@@ summary
testsuite-py3 PASS

diff --git a/debian/changelog b/debian/changelog
index 69a0f86..cdd8bcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-testtools (2.5.0-2ubuntu1) jammy; urgency=medium
+
+  * d/p/add-python-3.10-support.patch: Add support for Python 3.10
+    (LP: #1951877)
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 22 Nov 2021 17:19:39 -0300
+
 python-testtools (2.5.0-2) unstable; urgency=medium
 
   * Uploading to unstable.
diff --git a/debian/control b/debian/control
index 3e0b0a5..53b1fba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-testtools
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian OpenStack <[e-mail]>
 Uploaders:
  Thomas Goirand <[e-mail]>,
  Jelmer Vernooij <[e-mail]>,
diff --git a/debian/patches/add-python-3.10-support.patch b/debian/patches/add-python-3.10-support.patch
 new file mode 100644
index 0000000..63a2376
--- /dev/null
+++ b/debian/patches/add-python-3.10-support.patch
@@ -0,0 +1,112 @@
+From ec9bb7ed026566688a14be9d8d5d1e4c506e71c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=BCrgen=20Gmach?= <[e-mail]>
+Date: Thu, 14 Oct 2021 21:00:21 +0200
+Subject: [PATCH] Add support for Python 3.10
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-testtools/+bug/1951877
+Last-Update: 2021-11-22
+Origin: upstream, https://github.com/testing-cabal/testtools/commit/ec9bb7ed026566688a14be9d8d5d1e4c506e71c0
+---
+ .github/workflows/test.yml         | 2 +-
+ NEWS                               | 9 +++++++++
+ scripts/all-pythons                | 2 +-
+ setup.cfg                          | 1 +
+ testtools/tests/test_testresult.py | 5 ++++-
+ tox.ini                            | 2 +-
+ 6 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
+index 70cacf7..44c27b7 100644
+--- a/.github/workflows/test.yml
++++ b/.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
+diff --git a/NEWS b/NEWS
+index df49f5e..cf7f84f 100644
+--- a/NEWS
++++ b/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
+ ~~~~~
+ 
+diff --git a/scripts/all-pythons b/scripts/all-pythons
+index 6996a44..0fbe010 100755
+--- a/scripts/all-pythons
++++ b/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:])
+diff --git a/setup.cfg b/setup.cfg
+index f252785..c31f8f3 100644
+--- a/setup.cfg
++++ b/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
+diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py
+index a9db0e2..4fbf15d 100644
+--- a/testtools/tests/test_testresult.py
++++ b/testtools/tests/test_testresult.py
+@@ -2667,16 +2667,19 @@ class TestNonAsciiResults(TestCase):
+         """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)
+ 
+diff --git a/tox.ini b/tox.ini
+index 5e9ab12..0416e06 100644
+--- a/tox.ini
++++ b/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]
+-- 
+2.32.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 7b6c61e..0cbb43c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 neutralize-failing-test.patch
 remove-test_syntax_error_line_utf_8.patch
+add-python-3.10-support.patch