Accepting request 851543 from home:bnavigator:branches:devel:languages:python:numeric

- Support multiple python3 flavors gh#openSUSE/python-rpm-macros#66
  * Fix pytest call expansion
  * Fix f2py entry point

OBS-URL: https://build.opensuse.org/request/show/851543
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=78
This commit is contained in:
Matej Cepl 2020-11-30 15:01:32 +00:00 committed by Git OBS Bridge
parent 68b917de82
commit 2647c1b9cc
2 changed files with 25 additions and 6 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Nov 28 16:08:40 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- Support multiple python3 flavors gh#openSUSE/python-rpm-macros#66
* Fix pytest call expansion
* Fix f2py entry point
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 2 13:29:32 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de> Fri Oct 2 13:29:32 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -256,12 +256,17 @@ mkdir testing
pushd testing pushd testing
# boo#1148173 gh#numpy/numpy#14438 # boo#1148173 gh#numpy/numpy#14438
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
%define skiptest -k "not test_generalized_sq" test_failok="test_generalized_sq"
%pytest_arch -n auto --pyargs numpy %{buildroot}%{python_sitearch}/numpy -k "test_generalized_sq" || true
%endif %endif
%pytest_arch -n auto --pyargs numpy %{buildroot}%{python_sitearch}/numpy %{?skiptest} %{python_expand # for all python3 flavors
export PYTHONPATH=%{buildroot}%{$python_sitearch}
export PYTHONDONTWRITEBYTECODE=1
testcall="pytest-%{$python_bin_suffix} -n auto %{buildroot}%{$python_sitearch}/numpy"
[ -n "$test_failok" ] && ${testcall} -k "$test_failok" || true
${testcall} ${test_failok:+-k "not ($test_failok)"}
rm -Rf %{buildroot}%{$python_sitearch}/numpy/.pytest_cache
}
popd popd
rm -Rf %{buildroot}%{python_sitearch}/numpy/.pytest_cache
%endif %endif
%if %{without hpc} %if %{without hpc}
@ -276,7 +281,10 @@ rm -Rf %{buildroot}%{python_sitearch}/numpy/.pytest_cache
%doc README.md THANKS.txt %doc README.md THANKS.txt
%if %{without hpc} %if %{without hpc}
%python_alternative %{_bindir}/f2py %python_alternative %{_bindir}/f2py
%python3_only %{_bindir}/f2py3* %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
%{_bindir}/f2py3
%endif
%{_bindir}/f2py%{python_bin_suffix}
%{python_sitearch}/numpy/ %{python_sitearch}/numpy/
%{python_sitearch}/numpy-%{version}-py*.egg-info %{python_sitearch}/numpy-%{version}-py*.egg-info
%license %{python_sitearch}/numpy/LICENSE.txt %license %{python_sitearch}/numpy/LICENSE.txt
@ -285,7 +293,11 @@ rm -Rf %{buildroot}%{python_sitearch}/numpy/.pytest_cache
%exclude %{python_sitearch}/numpy/f2py/src/ %exclude %{python_sitearch}/numpy/f2py/src/
%exclude %{python_sitearch}/numpy/core/lib/libnpymath.a %exclude %{python_sitearch}/numpy/core/lib/libnpymath.a
%else %else
%python3_only %{p_bindir}/f2py* %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
%{p_bindir}/f2py
%{p_bindir}/f2py3
%endif
%{p_bindir}/f2py%{python_bin_suffix}
%{p_python_sitearch}/numpy/ %{p_python_sitearch}/numpy/
%{p_python_sitearch}/numpy-%{version}-py*.egg-info %{p_python_sitearch}/numpy-%{version}-py*.egg-info
%license %{p_python_sitearch}/numpy/LICENSE.txt %license %{p_python_sitearch}/numpy/LICENSE.txt