diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..c685be2 --- /dev/null +++ b/_constraints @@ -0,0 +1,10 @@ + + + + 5 + + + 5 + + + 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 914444e..5b7f588 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +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 + +- Add constraints for testsuite to not run out of mem/disk space +- Use %license macro + +------------------------------------------------------------------- +Tue Feb 19 12:52:51 UTC 2019 - Tomáš Chvátal + +- Enable testsuite + ------------------------------------------------------------------- Tue Feb 5 22:14:25 UTC 2019 - Todd R diff --git a/python-numpy.spec b/python-numpy.spec index adfc130..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 @@ -119,6 +115,7 @@ Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc %endif BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros BuildRequires: unzip @@ -200,7 +197,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %if %{without hpc} -%python_expand rm -rf %{buildroot}%{$python_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite +#%%python_expand rm -rf %{buildroot}%{$python_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite %else @@ -245,6 +242,14 @@ 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) %doc *.txt @@ -270,7 +275,7 @@ EOF %files %{python_files devel} %defattr(-,root,root) -%doc LICENSE.txt +%license LICENSE.txt %{p_python_sitearch}/numpy/*/*/*.c %{p_python_sitearch}/numpy/*/*.h %{p_python_sitearch}/numpy/*/*/*.h