From 47e54848ed6c41bc7ccd153baa46fdf29e50a5bfcfe2dee26a9d7287635f35c8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 5 Aug 2020 18:37:55 +0000 Subject: [PATCH] - Remove dependency on pytest-runner as it is unnecessary OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=98 --- python-Pillow.changes | 5 +++++ python-Pillow.spec | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/python-Pillow.changes b/python-Pillow.changes index 0dc169e..7da44bc 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 5 18:37:46 UTC 2020 - Matej Cepl + +- Remove dependency on pytest-runner as it is unnecessary + ------------------------------------------------------------------- Sat Jul 11 18:36:52 UTC 2020 - Arun Persaud diff --git a/python-Pillow.spec b/python-Pillow.spec index 7ebfc7d..b21a80a 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -28,7 +28,6 @@ URL: https://python-pillow.org/ Source: https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-%{version}.tar.gz BuildRequires: %{python_module devel} BuildRequires: %{python_module olefile} -BuildRequires: %{python_module pytest-runner} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module tk} @@ -99,18 +98,18 @@ Python Imaging Library by Fredrik Lundh and Contributors. %{python_expand echo "PIL" > %{buildroot}%{$python_sitearch}/PIL.pth} %check -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} +%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1 %if %{_arch} == s390 || %{_arch} == s390x echo "WARNING ignoring tests completely due to https://github.com/python-pillow/Pillow/issues/1204 and segfault" %else %if %{_arch} == ppc || %{_arch} == ppc64 $python selftest.py --installed || \ echo "WARNING ignore failure https://github.com/python-pillow/Pillow/issues/1204" -$python setup.py test || \ +pytest-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v || \ echo "WARNING ignore failure https://github.com/python-pillow/Pillow/issues/1204" %else $python selftest.py --installed -$python -m pytest -v -k 'not (test_stroke or test_stroke_multiline)' +pytest-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v -k 'not (test_stroke or test_stroke_multiline)' %endif %endif }