- Add patch to build with python 3.7:

* testtools-py37.patch
- Remove unittest2 dependency, it is needed only on python2.6

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testtools?expand=0&rev=56

python-testtools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 10 11:27:08 UTC 2018 - tchvatal@suse.com
+
+- Add patch to build with python 3.7:
+  * testtools-py37.patch
+- Remove unittest2 dependency, it is needed only on python2.6
+
 -------------------------------------------------------------------
 Thu Mar  8 10:17:39 UTC 2018 - aplanas@suse.com
 

python-testtools.spec

@@ -23,9 +23,9 @@ Release:        0
 Summary:        Extensions to the Python Standard Library Unit Testing Framework
 License:        MIT
 Group:          Development/Languages/Python
-Url:            https://launchpad.net/testtools
+URL:            https://github.com/testing-cabal/testtools
-Source:         https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz
-BuildRequires:  %{python_module devel}
+Patch0:         testtools-py37.patch
 BuildRequires:  %{python_module extras >= 1.0.0}
 BuildRequires:  %{python_module pbr}
 BuildRequires:  %{python_module setuptools}
@@ -36,12 +36,10 @@ Requires:       python-pbr >= 0.11
 Requires:       python-python-mimeparse
 Requires:       python-six >= 1.4.0
 Requires:       python-traceback2
-Requires:       python-unittest2 >= 1.0.0
+BuildArch:      noarch
 %if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24
 Recommends:     python-fixtures >= 1.3.0
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
 %python_subpackages
 
 %description
@@ -52,6 +50,7 @@ also ports recent unittest changes all the way back to Python 2.4.
 
 %prep
 %setup -q -n testtools-%{version}
+%patch0 -p1
 
 %build
 %python_build
@@ -61,8 +60,8 @@ also ports recent unittest changes all the way back to Python 2.4.
 %python_expand %fdupes -s %{buildroot}%{$python_sitelib}
 
 %files %{python_files}
-%defattr(-,root,root,-)
+%license LICENSE
-%doc LICENSE NEWS README.rst
+%doc NEWS README.rst
 %{python_sitelib}/testtools
 %{python_sitelib}/testtools-%{version}-py*.egg-info
 

testtools-py37.patch

@@ -0,0 +1,54 @@
+From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 17 May 2018 17:52:26 +0200
+Subject: [PATCH] Fix the tests on Python 3.7
+
+Exception's repr got changed not to include trailing comma
+
+Fixes https://github.com/testing-cabal/testtools/issues/270
+---
+ .travis.yml                                |  1 +
+ testtools/tests/matchers/test_exception.py | 11 +++++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 7f1f4db7..784608e0 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -5,6 +5,7 @@ python:
+   - "3.4"
+   - "3.5"
+   - "3.6"
++  - "3.7-dev"
+   - "pypy"
+ 
+ install:
+diff --git a/testtools/tests/matchers/test_exception.py b/testtools/tests/matchers/test_exception.py
+index 6cd80af1..acd39252 100644
+--- a/testtools/tests/matchers/test_exception.py
++++ b/testtools/tests/matchers/test_exception.py
+@@ -32,15 +32,22 @@ class TestMatchesExceptionInstanceInterface(TestCase, TestMatchersInterface):
+     matches_matches = [error_foo]
+     matches_mismatches = [error_bar, error_base_foo]
+ 
++    if sys.version_info >= (3, 7):
++        # exception's repr has changed
++        _e = ''
++    else:
++        _e = ','
++
+     str_examples = [
+-        ("MatchesException(Exception('foo',))",
++        ("MatchesException(Exception('foo'%s))" % _e,
+          MatchesException(Exception('foo')))
+         ]
+     describe_examples = [
+         ("%r is not a %r" % (Exception, ValueError),
+          error_base_foo,
+          MatchesException(ValueError("foo"))),
+-        ("ValueError('bar',) has different arguments to ValueError('foo',).",
++        ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)."
++         % (_e, _e),
+          error_bar,
+          MatchesException(ValueError("foo"))),
+         ]