From d68bcec2b767fdd842b1f6603b7e0dee7a748828858166f69fb03e31a6db512a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 4 Nov 2019 15:46:02 +0000 Subject: [PATCH] - Add pytest4.patch allowing the test suite to pass with pytest 4 Because of gh#hamcrest/PyHamcrest#123 we have to remove tests/hamcrest_unit_test/core/is{_test,instanceof_test}.py to make the test suite passing. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyHamcrest?expand=0&rev=11 --- pytest4.patch | 4 +--- python-PyHamcrest.changes | 8 ++++++++ python-PyHamcrest.spec | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pytest4.patch b/pytest4.patch index 1061c6a..757d26a 100644 --- a/pytest4.patch +++ b/pytest4.patch @@ -8,11 +8,9 @@ Subject: [PATCH] Silence warnings from tests due to use of old tests/hamcrest_unit_test/base_description_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/tests/hamcrest_unit_test/base_description_test.py b/tests/hamcrest_unit_test/base_description_test.py -index 82cd238..60f1862 100644 --- a/tests/hamcrest_unit_test/base_description_test.py +++ b/tests/hamcrest_unit_test/base_description_test.py -@@ -35,10 +35,10 @@ def test_append_text_delegates(desc): +@@ -34,10 +34,10 @@ def test_append_text_delegates(desc): @pytest.mark.parametrize('described, appended', ( (Described(), 'described'), diff --git a/python-PyHamcrest.changes b/python-PyHamcrest.changes index 1cd774a..6943d11 100644 --- a/python-PyHamcrest.changes +++ b/python-PyHamcrest.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 4 14:35:43 UTC 2019 - Matej Cepl + +- Add pytest4.patch allowing the test suite to pass with pytest 4 + Because of gh#hamcrest/PyHamcrest#123 we have to remove + tests/hamcrest_unit_test/core/is{_test,instanceof_test}.py to + make the test suite passing. + ------------------------------------------------------------------- Fri Jul 19 10:22:31 UTC 2019 - Tomáš Chvátal diff --git a/python-PyHamcrest.spec b/python-PyHamcrest.spec index b27788e..6de9c2f 100644 --- a/python-PyHamcrest.spec +++ b/python-PyHamcrest.spec @@ -31,7 +31,7 @@ Patch0: 0001-Add-boolean-matchers.patch Patch1: pytest4.patch BuildRequires: %{python_module hypothesis >= 1.11} BuildRequires: %{python_module mock} -BuildRequires: %{python_module pytest < 4.0} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six >= 1.4} BuildRequires: fdupes @@ -61,6 +61,8 @@ rm pytest.ini %python_expand %fdupes %{buildroot}%{$python_sitelib}/hamcrest %check +# gh#hamcrest/PyHamcrest#123 +rm -f tests/hamcrest_unit_test/core/is{_test,instanceof_test}.py %pytest %files %{python_files}