From 1a645b766dfcac5ae55a02ece25ac8adc677b9008f747144a8fce1568abd994d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 8 May 2021 20:31:15 +0000 Subject: [PATCH 1/2] - Skip tests using fftw library, we don't have the support built in ImageMagick (see gh#emcconville/wand#476). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Wand?expand=0&rev=3 --- python-Wand.changes | 6 ++++++ python-Wand.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/python-Wand.changes b/python-Wand.changes index 3b23d58..934ae6c 100644 --- a/python-Wand.changes +++ b/python-Wand.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 8 20:30:37 UTC 2021 - Matej Cepl + +- Skip tests using fftw library, we don't have the support built + in ImageMagick (see gh#emcconville/wand#476). + ------------------------------------------------------------------- Mon Mar 1 01:50:31 UTC 2021 - John Vandenberg diff --git a/python-Wand.spec b/python-Wand.spec index 9e3385e..6feb3a7 100644 --- a/python-Wand.spec +++ b/python-Wand.spec @@ -1,7 +1,7 @@ # # spec file for package python-Wand # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ BuildRequires: %{python_module setuptools} Requires: ImageMagick BuildRequires: ImageMagick-devel BuildRequires: fdupes +BuildRequires: fftw3-devel BuildRequires: python-rpm-macros BuildArch: noarch # SECTION test requirements @@ -53,6 +54,9 @@ Ctypes-based simple MagickWand API binding for Python. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check +# Our ImageMagick is build without support of fftw library +# see identify -version and gh#emcconville/wand#476 +export PYTEST_ADDOPTS="--skip-fft" # Three tests failing with # wand.exceptions.PolicyError: attempt to perform an operation not allowed by the security policy `PDF' # due to https://build.opensuse.org/package/view_file/graphics/ImageMagick/ImageMagick-configuration-SUSE.patch From 314f65402692faf218b26faa06773f5ede55cd1613fdf2111617044ce5adb27c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 8 May 2021 20:44:43 +0000 Subject: [PATCH 2/2] Accepting request 891406 from home:bnavigator:branches:devel:languages:python - Fix numpy test BuildRequires for flavors beyond python38 OBS-URL: https://build.opensuse.org/request/show/891406 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Wand?expand=0&rev=4 --- python-Wand.changes | 5 +++++ python-Wand.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python-Wand.changes b/python-Wand.changes index 934ae6c..a709761 100644 --- a/python-Wand.changes +++ b/python-Wand.changes @@ -4,6 +4,11 @@ Sat May 8 20:30:37 UTC 2021 - Matej Cepl - Skip tests using fftw library, we don't have the support built in ImageMagick (see gh#emcconville/wand#476). +------------------------------------------------------------------- +Fri May 7 23:47:46 UTC 2021 - Benjamin Greiner + +- Fix numpy test BuildRequires for flavors beyond python38 + ------------------------------------------------------------------- Mon Mar 1 01:50:31 UTC 2021 - John Vandenberg diff --git a/python-Wand.spec b/python-Wand.spec index 6feb3a7..3160fb6 100644 --- a/python-Wand.spec +++ b/python-Wand.spec @@ -35,8 +35,7 @@ BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module psutil >= 1.0.1} BuildRequires: %{python_module pytest >= 2.3.0} -BuildRequires: (python3-numpy if python3-base < 3.8) -BuildRequires: (python38-numpy if python38-base) +BuildRequires: %{python_module numpy if (%python-base without python36-base)} # /SECTION %python_subpackages