From 61e5d6feb84bdbe9631ff78e9c361cc3ed0e0643f9bbf7f33060edd0407c89de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 2 Nov 2018 08:20:44 +0000 Subject: [PATCH 1/3] Accepting request 645918 from home:mcepl:work - Remove requirements of unittest2 and linecache2 adding two additional patches remove-linecache2.patch and remove-unittest2.patch. OBS-URL: https://build.opensuse.org/request/show/645918 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testtools?expand=0&rev=61 --- python-testtools-doc.changes | 7 +++ python-testtools-doc.spec | 8 ++- python-testtools.changes | 7 +++ python-testtools.spec | 15 +++-- remove-linecache2.patch | 25 ++++++++ remove-unittest2.patch | 107 +++++++++++++++++++++++++++++++++++ 6 files changed, 162 insertions(+), 7 deletions(-) create mode 100644 remove-linecache2.patch create mode 100644 remove-unittest2.patch diff --git a/python-testtools-doc.changes b/python-testtools-doc.changes index 8ab88f3..4ba2418 100644 --- a/python-testtools-doc.changes +++ b/python-testtools-doc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 11 14:52:44 CEST 2018 - mcepl@suse.com + +- Remove requirements of unittest2 and linecache2 adding two + additional patches remove-linecache2.patch and + remove-unittest2.patch. + ------------------------------------------------------------------- Sat Aug 11 08:04:56 UTC 2018 - tchvatal@suse.com diff --git a/python-testtools-doc.spec b/python-testtools-doc.spec index d6dc505..fb517e6 100644 --- a/python-testtools-doc.spec +++ b/python-testtools-doc.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,13 +26,17 @@ Group: Documentation/HTML URL: https://launchpad.net/testtools Source: https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz Patch0: testtools-py37.patch +Patch1: remove-unittest2.patch +Patch2: remove-linecache2.patch BuildRequires: %{python_module testscenarios} BuildRequires: %{python_module testtools = %{version}} +BuildRequires: %{python_module traceback2} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-Sphinx Provides: python2-testtools-doc = %{version} Provides: python3-testtools-doc = %{version} +Requires: python-traceback2 BuildArch: noarch %description @@ -40,7 +44,7 @@ Documentation and help files for python-testtools. %prep %setup -q -n testtools-%{version} -%patch0 -p1 +%autopatch -p1 %build python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo diff --git a/python-testtools.changes b/python-testtools.changes index 8ba0607..712dd3e 100644 --- a/python-testtools.changes +++ b/python-testtools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 11 14:52:44 CEST 2018 - mcepl@suse.com + +- Remove requirements of unittest2 and linecache2 adding two + additional patches remove-linecache2.patch and + remove-unittest2.patch. + ------------------------------------------------------------------- Fri Aug 10 11:27:08 UTC 2018 - tchvatal@suse.com diff --git a/python-testtools.spec b/python-testtools.spec index 9201654..7ff1c9c 100644 --- a/python-testtools.spec +++ b/python-testtools.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,9 +26,12 @@ Group: Development/Languages/Python URL: https://github.com/testing-cabal/testtools Source: https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz Patch0: testtools-py37.patch +Patch1: remove-unittest2.patch +Patch2: remove-linecache2.patch BuildRequires: %{python_module extras >= 1.0.0} BuildRequires: %{python_module pbr} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module traceback2} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-extras >= 1.0.0 @@ -36,7 +39,6 @@ Requires: python-pbr >= 0.11 Requires: python-python-mimeparse Requires: python-six >= 1.4.0 Requires: python-traceback2 -Requires: python-unittest2 >= 1.1.0 BuildArch: noarch %if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 Recommends: python-fixtures >= 1.3.0 @@ -51,15 +53,18 @@ also ports recent unittest changes all the way back to Python 2.4. %prep %setup -q -n testtools-%{version} -%patch0 -p1 - +%autopatch -p1 %build %python_build %install %python_install -%python_expand %fdupes -s %{buildroot}%{$python_sitelib} +%{python_expand \ +$python -m compileall -d %{$python_sitelib} -x _compat2x %{buildroot}%{$python_sitelib}/testtools/ +$python -O -m compileall -d %{$python_sitelib} -x _compat2x %{buildroot}%{$python_sitelib}/testtools/ +%fdupes -s %{buildroot}%{$python_sitelib} +} %files %{python_files} %license LICENSE diff --git a/remove-linecache2.patch b/remove-linecache2.patch new file mode 100644 index 0000000..aaf8bb7 --- /dev/null +++ b/remove-linecache2.patch @@ -0,0 +1,25 @@ +--- a/testtools/tests/test_compat.py ++++ b/testtools/tests/test_compat.py +@@ -3,7 +3,10 @@ + """Tests for miscellaneous compatibility functions""" + + import io +-import linecache2 as linecache ++try: ++ import linecache2 as linecache ++except ImportError: ++ import linecache + import os + import sys + import tempfile +--- a/testtools/compat.py ++++ b/testtools/compat.py +@@ -31,7 +31,7 @@ from extras import try_import, try_impor + BytesIO = try_imports(['StringIO.StringIO', 'io.BytesIO']) + StringIO = try_imports(['StringIO.StringIO', 'io.StringIO']) + # To let setup.py work, make this a conditional import. +-linecache = try_import('linecache2') ++linecache = try_imports(['linecache2', 'linecache']) + + try: + from testtools import _compat2x as _compat diff --git a/remove-unittest2.patch b/remove-unittest2.patch new file mode 100644 index 0000000..5031ce3 --- /dev/null +++ b/remove-unittest2.patch @@ -0,0 +1,107 @@ +--- a/testtools/tests/test_run.py ++++ b/testtools/tests/test_run.py +@@ -10,7 +10,7 @@ from textwrap import dedent + from extras import try_import + fixtures = try_import('fixtures') + testresources = try_import('testresources') +-import unittest2 ++import unittest + + import testtools + from testtools import TestCase, run, skipUnless +@@ -195,13 +195,13 @@ testtools.runexample.TestFoo.test_quux + broken = self.useFixture(SampleTestFixture(broken=True)) + out = StringIO() + # XXX: http://bugs.python.org/issue22811 +- unittest2.defaultTestLoader._top_level_dir = None ++ unittest.defaultTestLoader._top_level_dir = None + exc = self.assertRaises( + SystemExit, + run.main, ['prog', 'discover', '-l', broken.package.base, '*.py'], out) + self.assertEqual(2, exc.args[0]) + self.assertThat(out.getvalue(), DocTestMatches("""\ +-unittest2.loader._FailedTest.runexample ++unittest.loader._FailedTest.runexample + Failed to import test module: runexample + Traceback (most recent call last): + File ".../loader.py", line ..., in _find_test_path +@@ -345,7 +345,7 @@ OK + pkg = self.useFixture(SampleLoadTestsPackage()) + out = StringIO() + # XXX: http://bugs.python.org/issue22811 +- unittest2.defaultTestLoader._top_level_dir = None ++ unittest.defaultTestLoader._top_level_dir = None + self.assertEqual(None, run.main( + ['prog', 'discover', '-l', pkg.package.base], out)) + self.assertEqual(dedent("""\ +--- a/testtools/tests/test_testsuite.py ++++ b/testtools/tests/test_testsuite.py +@@ -5,7 +5,6 @@ + import doctest + from pprint import pformat + import unittest +-import unittest2 + + from extras import try_import + +@@ -225,7 +224,7 @@ TypeError: run() takes ...1 ...argument. + pass + # Test discovery uses the default suite from unittest2 (unless users + # deliberately change things, in which case they keep both pieces). +- suite = unittest2.TestSuite([Skips("test_notrun")]) ++ suite = unittest.TestSuite([Skips("test_notrun")]) + log = [] + result = LoggingResult(log) + suite.run(result) +@@ -242,7 +241,7 @@ TypeError: run() takes ...1 ...argument. + pass + # Test discovery uses the default suite from unittest2 (unless users + # deliberately change things, in which case they keep both pieces). +- suite = unittest2.TestSuite([Simples("test_simple")]) ++ suite = unittest.TestSuite([Simples("test_simple")]) + log = [] + result = LoggingResult(log) + suite.run(result) +--- a/testtools/tests/twistedsupport/test_deferred.py ++++ b/testtools/tests/twistedsupport/test_deferred.py +@@ -52,5 +52,5 @@ class TestExtractResult(NeedsTwistedTest + + + def test_suite(): +- from unittest2 import TestLoader, TestSuite ++ from unittest import TestLoader, TestSuite + return TestLoader().loadTestsFromName(__name__) +--- a/testtools/tests/twistedsupport/test_matchers.py ++++ b/testtools/tests/twistedsupport/test_matchers.py +@@ -205,5 +205,5 @@ class FailureResultTests(NeedsTwistedTes + + + def test_suite(): +- from unittest2 import TestLoader, TestSuite ++ from unittest import TestLoader, TestSuite + return TestLoader().loadTestsFromName(__name__) +--- a/testtools/tests/twistedsupport/test_runtest.py ++++ b/testtools/tests/twistedsupport/test_runtest.py +@@ -1016,7 +1016,7 @@ class TestCaptureTwistedLogs(NeedsTwiste + + + def test_suite(): +- from unittest2 import TestLoader, TestSuite ++ from unittest import TestLoader, TestSuite + return TestLoader().loadTestsFromName(__name__) + + +--- a/testtools/run.py ++++ b/testtools/run.py +@@ -195,7 +195,10 @@ class TestProgram(unittest.TestProgram): + else: + for test in iterate_tests(self.test): + self.stdout.write('%s\n' % test.id()) +- del self.testLoader.errors[:] ++ if hasattr(self.testLoader, 'errors'): ++ del self.testLoader.errors[:] ++ else: ++ self.testLoader.errors = [] + + def _getParentArgParser(self): + parser = super(TestProgram, self)._getParentArgParser() From 86de05fb9d57db189fe1da493bdbe00356d4c7a7584d69f6675716f7c7a590aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 15 Nov 2018 11:40:30 +0000 Subject: [PATCH 2/3] Accepting request 649240 from devel:languages:python Revert for now, breaks packages depending on this OBS-URL: https://build.opensuse.org/request/show/649240 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testtools?expand=0&rev=62 --- python-testtools-doc.changes | 7 --- python-testtools-doc.spec | 8 +-- python-testtools.changes | 7 --- python-testtools.spec | 15 ++--- remove-linecache2.patch | 25 -------- remove-unittest2.patch | 107 ----------------------------------- 6 files changed, 7 insertions(+), 162 deletions(-) delete mode 100644 remove-linecache2.patch delete mode 100644 remove-unittest2.patch diff --git a/python-testtools-doc.changes b/python-testtools-doc.changes index 4ba2418..8ab88f3 100644 --- a/python-testtools-doc.changes +++ b/python-testtools-doc.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 11 14:52:44 CEST 2018 - mcepl@suse.com - -- Remove requirements of unittest2 and linecache2 adding two - additional patches remove-linecache2.patch and - remove-unittest2.patch. - ------------------------------------------------------------------- Sat Aug 11 08:04:56 UTC 2018 - tchvatal@suse.com diff --git a/python-testtools-doc.spec b/python-testtools-doc.spec index fb517e6..d6dc505 100644 --- a/python-testtools-doc.spec +++ b/python-testtools-doc.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -26,17 +26,13 @@ Group: Documentation/HTML URL: https://launchpad.net/testtools Source: https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz Patch0: testtools-py37.patch -Patch1: remove-unittest2.patch -Patch2: remove-linecache2.patch BuildRequires: %{python_module testscenarios} BuildRequires: %{python_module testtools = %{version}} -BuildRequires: %{python_module traceback2} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-Sphinx Provides: python2-testtools-doc = %{version} Provides: python3-testtools-doc = %{version} -Requires: python-traceback2 BuildArch: noarch %description @@ -44,7 +40,7 @@ Documentation and help files for python-testtools. %prep %setup -q -n testtools-%{version} -%autopatch -p1 +%patch0 -p1 %build python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo diff --git a/python-testtools.changes b/python-testtools.changes index 712dd3e..8ba0607 100644 --- a/python-testtools.changes +++ b/python-testtools.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 11 14:52:44 CEST 2018 - mcepl@suse.com - -- Remove requirements of unittest2 and linecache2 adding two - additional patches remove-linecache2.patch and - remove-unittest2.patch. - ------------------------------------------------------------------- Fri Aug 10 11:27:08 UTC 2018 - tchvatal@suse.com diff --git a/python-testtools.spec b/python-testtools.spec index 7ff1c9c..9201654 100644 --- a/python-testtools.spec +++ b/python-testtools.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -26,12 +26,9 @@ Group: Development/Languages/Python URL: https://github.com/testing-cabal/testtools Source: https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz Patch0: testtools-py37.patch -Patch1: remove-unittest2.patch -Patch2: remove-linecache2.patch BuildRequires: %{python_module extras >= 1.0.0} BuildRequires: %{python_module pbr} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module traceback2} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-extras >= 1.0.0 @@ -39,6 +36,7 @@ Requires: python-pbr >= 0.11 Requires: python-python-mimeparse Requires: python-six >= 1.4.0 Requires: python-traceback2 +Requires: python-unittest2 >= 1.1.0 BuildArch: noarch %if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 Recommends: python-fixtures >= 1.3.0 @@ -53,18 +51,15 @@ also ports recent unittest changes all the way back to Python 2.4. %prep %setup -q -n testtools-%{version} -%autopatch -p1 +%patch0 -p1 + %build %python_build %install %python_install -%{python_expand \ -$python -m compileall -d %{$python_sitelib} -x _compat2x %{buildroot}%{$python_sitelib}/testtools/ -$python -O -m compileall -d %{$python_sitelib} -x _compat2x %{buildroot}%{$python_sitelib}/testtools/ -%fdupes -s %{buildroot}%{$python_sitelib} -} +%python_expand %fdupes -s %{buildroot}%{$python_sitelib} %files %{python_files} %license LICENSE diff --git a/remove-linecache2.patch b/remove-linecache2.patch deleted file mode 100644 index aaf8bb7..0000000 --- a/remove-linecache2.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/testtools/tests/test_compat.py -+++ b/testtools/tests/test_compat.py -@@ -3,7 +3,10 @@ - """Tests for miscellaneous compatibility functions""" - - import io --import linecache2 as linecache -+try: -+ import linecache2 as linecache -+except ImportError: -+ import linecache - import os - import sys - import tempfile ---- a/testtools/compat.py -+++ b/testtools/compat.py -@@ -31,7 +31,7 @@ from extras import try_import, try_impor - BytesIO = try_imports(['StringIO.StringIO', 'io.BytesIO']) - StringIO = try_imports(['StringIO.StringIO', 'io.StringIO']) - # To let setup.py work, make this a conditional import. --linecache = try_import('linecache2') -+linecache = try_imports(['linecache2', 'linecache']) - - try: - from testtools import _compat2x as _compat diff --git a/remove-unittest2.patch b/remove-unittest2.patch deleted file mode 100644 index 5031ce3..0000000 --- a/remove-unittest2.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- a/testtools/tests/test_run.py -+++ b/testtools/tests/test_run.py -@@ -10,7 +10,7 @@ from textwrap import dedent - from extras import try_import - fixtures = try_import('fixtures') - testresources = try_import('testresources') --import unittest2 -+import unittest - - import testtools - from testtools import TestCase, run, skipUnless -@@ -195,13 +195,13 @@ testtools.runexample.TestFoo.test_quux - broken = self.useFixture(SampleTestFixture(broken=True)) - out = StringIO() - # XXX: http://bugs.python.org/issue22811 -- unittest2.defaultTestLoader._top_level_dir = None -+ unittest.defaultTestLoader._top_level_dir = None - exc = self.assertRaises( - SystemExit, - run.main, ['prog', 'discover', '-l', broken.package.base, '*.py'], out) - self.assertEqual(2, exc.args[0]) - self.assertThat(out.getvalue(), DocTestMatches("""\ --unittest2.loader._FailedTest.runexample -+unittest.loader._FailedTest.runexample - Failed to import test module: runexample - Traceback (most recent call last): - File ".../loader.py", line ..., in _find_test_path -@@ -345,7 +345,7 @@ OK - pkg = self.useFixture(SampleLoadTestsPackage()) - out = StringIO() - # XXX: http://bugs.python.org/issue22811 -- unittest2.defaultTestLoader._top_level_dir = None -+ unittest.defaultTestLoader._top_level_dir = None - self.assertEqual(None, run.main( - ['prog', 'discover', '-l', pkg.package.base], out)) - self.assertEqual(dedent("""\ ---- a/testtools/tests/test_testsuite.py -+++ b/testtools/tests/test_testsuite.py -@@ -5,7 +5,6 @@ - import doctest - from pprint import pformat - import unittest --import unittest2 - - from extras import try_import - -@@ -225,7 +224,7 @@ TypeError: run() takes ...1 ...argument. - pass - # Test discovery uses the default suite from unittest2 (unless users - # deliberately change things, in which case they keep both pieces). -- suite = unittest2.TestSuite([Skips("test_notrun")]) -+ suite = unittest.TestSuite([Skips("test_notrun")]) - log = [] - result = LoggingResult(log) - suite.run(result) -@@ -242,7 +241,7 @@ TypeError: run() takes ...1 ...argument. - pass - # Test discovery uses the default suite from unittest2 (unless users - # deliberately change things, in which case they keep both pieces). -- suite = unittest2.TestSuite([Simples("test_simple")]) -+ suite = unittest.TestSuite([Simples("test_simple")]) - log = [] - result = LoggingResult(log) - suite.run(result) ---- a/testtools/tests/twistedsupport/test_deferred.py -+++ b/testtools/tests/twistedsupport/test_deferred.py -@@ -52,5 +52,5 @@ class TestExtractResult(NeedsTwistedTest - - - def test_suite(): -- from unittest2 import TestLoader, TestSuite -+ from unittest import TestLoader, TestSuite - return TestLoader().loadTestsFromName(__name__) ---- a/testtools/tests/twistedsupport/test_matchers.py -+++ b/testtools/tests/twistedsupport/test_matchers.py -@@ -205,5 +205,5 @@ class FailureResultTests(NeedsTwistedTes - - - def test_suite(): -- from unittest2 import TestLoader, TestSuite -+ from unittest import TestLoader, TestSuite - return TestLoader().loadTestsFromName(__name__) ---- a/testtools/tests/twistedsupport/test_runtest.py -+++ b/testtools/tests/twistedsupport/test_runtest.py -@@ -1016,7 +1016,7 @@ class TestCaptureTwistedLogs(NeedsTwiste - - - def test_suite(): -- from unittest2 import TestLoader, TestSuite -+ from unittest import TestLoader, TestSuite - return TestLoader().loadTestsFromName(__name__) - - ---- a/testtools/run.py -+++ b/testtools/run.py -@@ -195,7 +195,10 @@ class TestProgram(unittest.TestProgram): - else: - for test in iterate_tests(self.test): - self.stdout.write('%s\n' % test.id()) -- del self.testLoader.errors[:] -+ if hasattr(self.testLoader, 'errors'): -+ del self.testLoader.errors[:] -+ else: -+ self.testLoader.errors = [] - - def _getParentArgParser(self): - parser = super(TestProgram, self)._getParentArgParser() From b3f52a902f416f882031fcd744e34d2fc8d8c2f3db96eb435a8feb2f08749c43 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 14 Oct 2019 14:47:25 +0000 Subject: [PATCH 3/3] - Replace %fdupes -s with plain %fdupes; hardlinks are better. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testtools?expand=0&rev=63 --- python-testtools-doc.changes | 5 +++++ python-testtools-doc.spec | 4 ++-- python-testtools.changes | 5 +++++ python-testtools.spec | 7 +++---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/python-testtools-doc.changes b/python-testtools-doc.changes index 8ab88f3..c43ae8f 100644 --- a/python-testtools-doc.changes +++ b/python-testtools-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 14 16:46:45 CEST 2019 - Matej Cepl + +- Replace %fdupes -s with plain %fdupes; hardlinks are better. + ------------------------------------------------------------------- Sat Aug 11 08:04:56 UTC 2018 - tchvatal@suse.com diff --git a/python-testtools-doc.spec b/python-testtools-doc.spec index d6dc505..7b9caa6 100644 --- a/python-testtools-doc.spec +++ b/python-testtools-doc.spec @@ -1,7 +1,7 @@ # # spec file for package python-testtools-doc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # diff --git a/python-testtools.changes b/python-testtools.changes index 8ba0607..5f25273 100644 --- a/python-testtools.changes +++ b/python-testtools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 14 16:47:02 CEST 2019 - Matej Cepl + +- Replace %fdupes -s with plain %fdupes; hardlinks are better. + ------------------------------------------------------------------- Fri Aug 10 11:27:08 UTC 2018 - tchvatal@suse.com diff --git a/python-testtools.spec b/python-testtools.spec index 9201654..2562937 100644 --- a/python-testtools.spec +++ b/python-testtools.spec @@ -1,7 +1,7 @@ # # spec file for package python-testtools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -53,13 +53,12 @@ also ports recent unittest changes all the way back to Python 2.4. %setup -q -n testtools-%{version} %patch0 -p1 - %build %python_build %install %python_install -%python_expand %fdupes -s %{buildroot}%{$python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %files %{python_files} %license LICENSE