From 108b76c7e89d4d441b3b4d42414cea5b655dec0c9e892e092f7a94e8a06a5f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jul 2019 07:10:01 +0000 Subject: [PATCH 1/3] - Restrict pytest5 for now, issue reported upstream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-sugar?expand=0&rev=4 --- python-pytest-sugar.changes | 5 +++++ python-pytest-sugar.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python-pytest-sugar.changes b/python-pytest-sugar.changes index 9b30252..3b0c594 100644 --- a/python-pytest-sugar.changes +++ b/python-pytest-sugar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 24 07:09:44 UTC 2019 - Tomáš Chvátal + +- Restrict pytest5 for now, issue reported upstream + ------------------------------------------------------------------- Tue Feb 12 15:52:25 UTC 2019 - Tomáš Chvátal diff --git a/python-pytest-sugar.spec b/python-pytest-sugar.spec index 09d22fc..b861989 100644 --- a/python-pytest-sugar.spec +++ b/python-pytest-sugar.spec @@ -23,15 +23,16 @@ Release: 0 Summary: Pretty printer for pytest progress License: BSD-3-Clause Group: Development/Languages/Python -URL: http://pivotfinland.com/pytest-sugar/ +URL: https://github.com/Frozenball/pytest-sugar Source: https://files.pythonhosted.org/packages/source/p/pytest-sugar/pytest-sugar-%{version}.tar.gz Patch0: pytest4.patch -BuildRequires: %{python_module pytest} +# https://github.com/Frozenball/pytest-sugar/issues/180 +BuildRequires: %{python_module pytest < 5.0} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module termcolor} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-pytest +Requires: python-pytest < 5.0 Requires: python-termcolor BuildArch: noarch %python_subpackages From 015aeef5d7dcc406f5ce1a542775d147fbbce86afaa3cf5493c8980ad1178f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jul 2019 12:08:39 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-sugar?expand=0&rev=5 --- python-pytest-sugar.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-pytest-sugar.spec b/python-pytest-sugar.spec index b861989..740a25f 100644 --- a/python-pytest-sugar.spec +++ b/python-pytest-sugar.spec @@ -26,8 +26,7 @@ Group: Development/Languages/Python URL: https://github.com/Frozenball/pytest-sugar Source: https://files.pythonhosted.org/packages/source/p/pytest-sugar/pytest-sugar-%{version}.tar.gz Patch0: pytest4.patch -# https://github.com/Frozenball/pytest-sugar/issues/180 -BuildRequires: %{python_module pytest < 5.0} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module termcolor} BuildRequires: fdupes @@ -52,7 +51,9 @@ pytest-sugar is a plugin for py.test that shows failures and errors instantly an %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} +# test_item_count_after_pytest_collection_modifyitems - https://github.com/Frozenball/pytest-sugar/issues/180 +# test_doctest - same as above +%pytest -k 'not test_item_count_after_pytest_collection_modifyitems and not test_doctest' %files %{python_files} %license LICENSE From 88d9cd1820edec07de0b87506e7d279c2dfde61fa938d4edcc99b3bdd3443769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jul 2019 12:08:59 +0000 Subject: [PATCH 3/3] - Skip failing pytest5 checks that need tweaking upstream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-sugar?expand=0&rev=6 --- python-pytest-sugar.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pytest-sugar.changes b/python-pytest-sugar.changes index 3b0c594..2003c04 100644 --- a/python-pytest-sugar.changes +++ b/python-pytest-sugar.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Jul 24 07:09:44 UTC 2019 - Tomáš Chvátal -- Restrict pytest5 for now, issue reported upstream +- Skip failing pytest5 checks that need tweaking upstream ------------------------------------------------------------------- Tue Feb 12 15:52:25 UTC 2019 - Tomáš Chvátal