From ff0cd5331d84f02ad12b710a22f139c259bd628d1192618e45e104763696d723 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 13 May 2020 09:14:41 +0000 Subject: [PATCH 1/4] - Skip three tests which are failing with new GCC10 (gh#numpy/numpy#16212) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=61 --- python-numpy.changes | 6 ++++++ python-numpy.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-numpy.changes b/python-numpy.changes index 9898041..e22ef07 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 13 09:13:22 UTC 2020 - Matej Cepl + +- Skip three tests which are failing with new GCC10 + (gh#numpy/numpy#16212) + ------------------------------------------------------------------- Sat May 9 16:16:28 UTC 2020 - Arun Persaud diff --git a/python-numpy.spec b/python-numpy.spec index fa574c3..09236b0 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -254,7 +254,8 @@ pushd testing %ifarch ppc64 ppc64le %pytest_arch -n auto --pyargs numpy || echo "Warning: ignore check error for PowerPC bypass boo#1148173" %else -%pytest_arch -n auto --pyargs numpy +# gh#numpy/numpy#16212 +%pytest_arch -n auto --pyargs numpy -k 'not (test_big_arrays or test_empty_npz or test_savez_filename_clashes)' %endif popd %endif From 414b1d35b178cf3b28f8ddd34c9accda6d05ec41ecdf600c029e14155e24ec85 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 13 May 2020 09:18:22 +0000 Subject: [PATCH 2/4] Better organization of skipped tests. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=62 --- python-numpy.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python-numpy.spec b/python-numpy.spec index 09236b0..07c30dd 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -251,12 +251,12 @@ export PYTHONDONTWRITEBYTECODE=1 export PATH="%{buildroot}%{_bindir}:$PATH" mkdir testing pushd testing -%ifarch ppc64 ppc64le -%pytest_arch -n auto --pyargs numpy || echo "Warning: ignore check error for PowerPC bypass boo#1148173" -%else +SKIP_TESTS="" +%ifarch %{ix86} # gh#numpy/numpy#16212 -%pytest_arch -n auto --pyargs numpy -k 'not (test_big_arrays or test_empty_npz or test_savez_filename_clashes)' +SKIP_TESTS+="not (test_big_arrays or test_empty_npz or test_savez_filename_clashes)" %endif +%pytest_arch -n auto --pyargs numpy -k "$SKIP_TESTS" popd %endif From 7debbe2024356159dd077a5c583f93271aed9caeb04a61a0917953427612c55b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 13 May 2020 17:38:52 +0000 Subject: [PATCH 3/4] - Reorganize check section to pass OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=63 --- python-numpy.changes | 3 +-- python-numpy.spec | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/python-numpy.changes b/python-numpy.changes index e22ef07..8e5aee6 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- Wed May 13 09:13:22 UTC 2020 - Matej Cepl -- Skip three tests which are failing with new GCC10 - (gh#numpy/numpy#16212) +- Reorganize check section to pass ------------------------------------------------------------------- Sat May 9 16:16:28 UTC 2020 - Arun Persaud diff --git a/python-numpy.spec b/python-numpy.spec index 07c30dd..2327ef3 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -254,12 +254,12 @@ pushd testing SKIP_TESTS="" %ifarch %{ix86} # gh#numpy/numpy#16212 -SKIP_TESTS+="not (test_big_arrays or test_empty_npz or test_savez_filename_clashes)" +# SKIP_TESTS+="not (test_big_arrays or test_empty_npz or test_savez_filename_clashes)" %endif -%pytest_arch -n auto --pyargs numpy -k "$SKIP_TESTS" +%python_expand export PYTHONPATH=%{_python_sysconfig_path $python stdlib}:%{$python_sitearch} +%pytest_arch -n auto --pyargs numpy %{buildroot}%{$python_sitearch}/numpy popd %endif - %if %{without hpc} %post %python_install_alternative f2py From a547fb6adf6c2ccb25e7b535dc1cb7578945d24640898b541b411d67dd84a8a6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 13 May 2020 17:39:28 +0000 Subject: [PATCH 4/4] Clean SPEC OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=64 --- python-numpy.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/python-numpy.spec b/python-numpy.spec index 2327ef3..0aa3802 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -251,11 +251,6 @@ export PYTHONDONTWRITEBYTECODE=1 export PATH="%{buildroot}%{_bindir}:$PATH" mkdir testing pushd testing -SKIP_TESTS="" -%ifarch %{ix86} -# gh#numpy/numpy#16212 -# SKIP_TESTS+="not (test_big_arrays or test_empty_npz or test_savez_filename_clashes)" -%endif %python_expand export PYTHONPATH=%{_python_sysconfig_path $python stdlib}:%{$python_sitearch} %pytest_arch -n auto --pyargs numpy %{buildroot}%{$python_sitearch}/numpy popd