From 106726e2f76d87aa103b61cb021913000f59c9a7479f26709f139a160e7b7ebd Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 19 Feb 2021 16:04:11 +0000 Subject: [PATCH] Accepting request 873812 from home:bnavigator:branches:devel:languages:python:numeric - Don't install and test numpy for python36. With NumPy 1.20, TW no longer provides a python36-numpy OBS-URL: https://build.opensuse.org/request/show/873812 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-uncertainties?expand=0&rev=21 --- python-uncertainties.changes | 6 ++++++ python-uncertainties.spec | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python-uncertainties.changes b/python-uncertainties.changes index 17d54fd..4e212e3 100644 --- a/python-uncertainties.changes +++ b/python-uncertainties.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 19 15:17:25 UTC 2021 - Ben Greiner + +- Don't install and test numpy for python36. With NumPy 1.20, TW + no longer provides a python36-numpy + ------------------------------------------------------------------- Sat Jan 9 20:05:34 UTC 2021 - Arun Persaud diff --git a/python-uncertainties.spec b/python-uncertainties.spec index 6a67dc9..ce3a1af 100644 --- a/python-uncertainties.spec +++ b/python-uncertainties.spec @@ -26,13 +26,13 @@ Group: Development/Languages/Python URL: https://github.com/lebigot/uncertainties/ Source: https://files.pythonhosted.org/packages/source/u/uncertainties/uncertainties-%{version}.tar.gz BuildRequires: %{python_module future} -BuildRequires: %{python_module numpy} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module testsuite} BuildRequires: %{python_module tools} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: %{python_module numpy if (%python-base without python36-base)} Requires: python-future BuildArch: noarch %if 0%{?suse_version} @@ -58,12 +58,14 @@ sed -i -e '/^#!\//, 1d' uncertainties/lib1to2/test_1to2.py %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest +# no python36-numpy +python36_ignore="--ignore uncertainties/unumpy" +%pytest ${$python_ignore} %files %{python_files} %license LICENSE.txt %doc README.rst %{python_sitelib}/uncertainties/ -%{python_sitelib}/uncertainties-%{version}-py*.egg-info +%{python_sitelib}/uncertainties-%{version}*-info %changelog