From 657c0bc1ce34aafe2414d74bc421815e284489ebf463fcf15c564be5ae4916cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 19 Feb 2019 12:53:12 +0000 Subject: [PATCH 1/5] - Enable testsuite OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=11 --- python-numpy.changes | 5 +++++ python-numpy.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python-numpy.changes b/python-numpy.changes index 914444e..c62d1ca 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..943bef0 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -200,7 +200,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 +245,12 @@ EOF } %endif +%check +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 + %files %{python_files} %defattr(-,root,root) %doc *.txt From 5bf4d817ee3968b41424deec1f068762e9f860cbe8e991894f785fe7678b9cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 19 Feb 2019 14:22:10 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=12 --- python-numpy.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-numpy.spec b/python-numpy.spec index 943bef0..bb6d91c 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -119,6 +119,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 From 9d89b4d70a5b2a8a1c6d86d6f5763d7327ea5b399ae3cc5d934c6591571ece5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 20 Feb 2019 09:28:32 +0000 Subject: [PATCH 3/5] - Add constraints for testsuite to not run out of mem/disk space OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=13 --- _constraints | 10 ++++++++++ python-numpy.changes | 5 +++++ 2 files changed, 15 insertions(+) create mode 100644 _constraints 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/python-numpy.changes b/python-numpy.changes index c62d1ca..8e61d56 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 20 09:28:00 UTC 2019 - Tomáš Chvátal + +- Add constraints for testsuite to not run out of mem/disk space + ------------------------------------------------------------------- Tue Feb 19 12:52:51 UTC 2019 - Tomáš Chvátal From 13579fa2be008ecd4bcc13b25d6dc4f884891023d0293aabfe4939be5502fcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 20 Feb 2019 09:29:00 +0000 Subject: [PATCH 4/5] - Use %license macro OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=14 --- python-numpy.changes | 1 + python-numpy.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/python-numpy.changes b/python-numpy.changes index 8e61d56..8ba51c3 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -2,6 +2,7 @@ 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 diff --git a/python-numpy.spec b/python-numpy.spec index bb6d91c..6e6250f 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -277,7 +277,7 @@ popd &> /dev/null %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 From 811ebadef39f12ab96f7d01e32ef95484f543db2f1d861c60de6986060839bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 20 Feb 2019 10:57:42 +0000 Subject: [PATCH 5/5] - Do not bother with standard flavor, just make it default - Execute the tests only on standard package for now not hpc variants OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=15 --- _multibuild | 1 - python-numpy.changes | 6 ++++++ python-numpy.spec | 6 ++---- 3 files changed, 8 insertions(+), 5 deletions(-) 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)