Hello community, here is the log from the commit of package python-colander for openSUSE:Factory checked in at 2020-04-18 00:31:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-colander (Old) and /work/SRC/openSUSE:Factory/.python-colander.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-colander" Sat Apr 18 00:31:00 2020 rev:6 rq:794806 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-colander/python-colander.changes 2020-01-19 20:58:09.644073042 +0100 +++ /work/SRC/openSUSE:Factory/.python-colander.new.2738/python-colander.changes 2020-04-18 00:32:29.746308916 +0200 @@ -1,0 +2,5 @@ +Fri Apr 17 08:10:18 UTC 2020 - Matej Cepl <mc...@suse.com> + +- Add fix-tests.patch allowing use of pytest (gh#Pylons/colander#210) + +------------------------------------------------------------------- New: ---- fix-tests.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-colander.spec ++++++ --- /var/tmp/diff_new_pack.ur5iRZ/_old 2020-04-18 00:32:30.630310747 +0200 +++ /var/tmp/diff_new_pack.ur5iRZ/_new 2020-04-18 00:32:30.630310747 +0200 @@ -25,6 +25,9 @@ License: BSD-4-Clause AND ZPL-2.1 AND MIT URL: https://github.com/Pylons/colander Source: https://files.pythonhosted.org/packages/source/c/colander/colander-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix-tests.patch gh#Pylons/colander#210 mc...@suse.com +# Fix tests to work with pytest (and nose2) as well +Patch0: fix-tests.patch BuildRequires: %{python_module setuptools} BuildRequires: %{python_module translationstring} BuildRequires: fdupes @@ -41,9 +44,9 @@ BuildRequires: %{python_module coverage} BuildRequires: %{python_module hupper} BuildRequires: %{python_module iso8601} -BuildRequires: %{python_module nose} BuildRequires: %{python_module plaster-pastedeploy} BuildRequires: %{python_module plaster} +BuildRequires: %{python_module pytest} # /SECTION %python_subpackages @@ -82,6 +85,7 @@ %prep %setup -q -n colander-%{version} +%autopatch -p1 %build %python_build @@ -94,7 +98,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec setup.py nosetests --with-coverage +%pytest %files %{python_files} %license LICENSE.txt ++++++ fix-tests.patch ++++++ --- a/colander/tests/test_colander.py +++ b/colander/tests/test_colander.py @@ -4156,7 +4156,7 @@ class TestTupleSchema(unittest.TestCase) self.assertEqual(schema.children[0], node) -class TestFunctional(object): +class FunctionalBase(object): def test_deserialize_ok(self): import colander.tests @@ -4433,7 +4433,7 @@ class TestFunctional(object): self.assertEqual(errors, expected) -class TestImperative(unittest.TestCase, TestFunctional): +class TestImperative(unittest.TestCase, FunctionalBase): def _makeSchema(self, name='schema'): import colander @@ -4472,7 +4472,7 @@ class TestImperative(unittest.TestCase, return schema -class TestDeclarative(unittest.TestCase, TestFunctional): +class TestDeclarative(unittest.TestCase, FunctionalBase): def _makeSchema(self, name='schema'): import colander @@ -4503,7 +4503,7 @@ class TestDeclarative(unittest.TestCase, return schema -class TestUltraDeclarative(unittest.TestCase, TestFunctional): +class TestUltraDeclarative(unittest.TestCase, FunctionalBase): def _makeSchema(self, name='schema'): import colander @@ -4547,7 +4547,7 @@ class TestUltraDeclarative(unittest.Test return schema -class TestDeclarativeWithInstantiate(unittest.TestCase, TestFunctional): +class TestDeclarativeWithInstantiate(unittest.TestCase, FunctionalBase): def _makeSchema(self, name='schema'): import colander