diff --git a/_multibuild b/_multibuild index 25ec331..1486389 100644 --- a/_multibuild +++ b/_multibuild @@ -1,4 +1,3 @@ - standard gnu-hpc diff --git a/python-numpy.changes b/python-numpy.changes index 8ba51c3..5b7f588 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 20 10:43:28 UTC 2019 - Tomáš Chvátal + +- Do not bother with standard flavor, just make it default +- Execute the tests only on standard package for now not hpc variants + ------------------------------------------------------------------- Wed Feb 20 09:28:00 UTC 2019 - Tomáš Chvátal diff --git a/python-numpy.spec b/python-numpy.spec index 6e6250f..a8e60c1 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -27,10 +27,6 @@ %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') %if "%flavor" == "" -ExclusiveArch: do_not_build -%endif - -%if "%flavor" == "standard" %bcond_with hpc %if 0%{?sle_version} == 120300 && !0%{?is_opensuse} %bcond_with openblas @@ -247,10 +243,12 @@ EOF %endif %check +%if %{without hpc} pushd doc &> /dev/null export PYTHONDONTWRITEBYTECODE=1 %python_expand PYTHONPATH="%{buildroot}%{$python_sitearch}" PATH="%{buildroot}%{_bindir}:$PATH" $python -m pytest -v --pyargs numpy popd &> /dev/null +%endif %files %{python_files} %defattr(-,root,root)