diff --git a/numpy-1.16.4.zip b/numpy-1.16.4.zip deleted file mode 100644 index b20be2f..0000000 --- a/numpy-1.16.4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7 -size 5122740 diff --git a/numpy-1.17.0.zip b/numpy-1.17.0.zip new file mode 100644 index 0000000..f95f1f0 --- /dev/null +++ b/numpy-1.17.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a +size 6486301 diff --git a/numpy-buildfix.patch b/numpy-buildfix.patch index 83f86bf..fd63864 100644 --- a/numpy-buildfix.patch +++ b/numpy-buildfix.patch @@ -3,21 +3,21 @@ @@ -49,7 +49,7 @@ """Return True if the C compiler is GCC 4.x.""" cmd._check_compiler() - body = """ --int -+void - main() - { - #if (! defined __GNUC__) || (__GNUC__ < 4) + body = textwrap.dedent(""" +- int ++ void + main() + { + #if (! defined __GNUC__) || (__GNUC__ < 4) --- a/numpy/distutils/command/install.py +++ b/numpy/distutils/command/install.py @@ -69,7 +69,7 @@ - need_rewrite = False - for l in f: - l = l.rstrip() -- if ' ' in l: -+ if ' ' in l and '%dir ' not in l: - need_rewrite = True - l = '"%s"' % (l) - lines.append(l) + need_rewrite = False + for l in f: + l = l.rstrip() +- if ' ' in l: ++ if ' ' in l and '%dir ' not in l: + need_rewrite = True + l = '"%s"' % (l) + lines.append(l) diff --git a/python-numpy.changes b/python-numpy.changes index 0cf9d18..016430c 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Jul 26 20:30:10 UTC 2019 - Todd R + +- Update to version 1.17.0 + Highlights + * A new extensible random module along with four selectable random number + generators and improved seeding designed for use in parallel processes has + been added. The currently available bit generators are MT19937, PCG64, + Philox, and SFC64. + * NumPy's FFT implementation was changed from fftpack to pocketfft, resulting + in faster, more accurate transforms and better handling of datasets of + prime length. + * New radix sort and timsort sorting methods. It is currently not possible to + choose which will be used, but they are hardwired to the datatype and used + when either ``stable`` or ``mergesort`` is passed as the method. + * Overriding numpy functions is now possible by default. +- Python 2 support has been dropped +- Rebase numpy-buildfix.patch + ------------------------------------------------------------------- Thu May 30 06:51:14 UTC 2019 - Martin Liška diff --git a/python-numpy.spec b/python-numpy.spec index c8970d4..2eef645 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -18,7 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define _ver 1_16_4 +%define _ver 1_17_0 %define pname python-numpy %bcond_with ringdisabled @@ -76,8 +76,9 @@ ExclusiveArch: do_not_build %endif %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: %{package_name} -Version: 1.16.4 +Version: 1.17.0 Release: 0 Summary: NumPy array processing for numbers, strings, records and objects License: BSD-3-Clause @@ -255,27 +256,27 @@ popd &> /dev/null %endif %files %{python_files} -%defattr(-,root,root) -%doc *.txt -%python2_only %{p_bindir}/f2py2* +%doc README.md THANKS.txt %python3_only %{p_bindir}/f2py3* %python3_only %{p_bindir}/f2py %if %{without hpc} %{python_sitearch}/numpy/ +%{python_sitearch}/numpy/LICENSE.txt %{python_sitearch}/numpy-%{version}-py*.egg-info -%exclude %{python_sitearch}/numpy/*/*/*.c -%exclude %{python_sitearch}/numpy/*/*.h -%exclude %{python_sitearch}/numpy/*/*/*.h -%exclude %{python_sitearch}/numpy/*/*/*/*.h +%license %{python_sitearch}/numpy/LICENSE.txt +%exclude %{python_sitearch}/numpy/core/include/ +%exclude %{python_sitearch}/numpy/distutils/mingw/gfortran_vs2003_hack.c +%exclude %{python_sitearch}/numpy/f2py/src/ %exclude %{python_sitearch}/numpy/core/lib/libnpymath.a %else %{p_python_sitearch}/numpy/ +%{p_python_sitearch}/numpy/LICENSE.txt %{p_python_sitearch}/numpy-%{version}-py*.egg-info -%exclude %{p_python_sitearch}/numpy/*/*/*.c -%exclude %{p_python_sitearch}/numpy/*/*.h -%exclude %{p_python_sitearch}/numpy/*/*/*.h -%exclude %{p_python_sitearch}/numpy/*/*/*/*.h +%license %{p_python_sitearch}/numpy/LICENSE.txt +%exclude %{p_python_sitearch}/numpy/core/include/ %exclude %{p_python_sitearch}/numpy/core/lib/libnpymath.a +%exclude %{p_python_sitearch}/numpy/distutils/mingw/gfortran_vs2003_hack.c +%exclude %{p_python_sitearch}/numpy/f2py/src/ %endif %if %{with hpc} @@ -288,20 +289,17 @@ popd &> /dev/null %endif %files %{python_files devel} -%defattr(-,root,root) %license LICENSE.txt %if %{without hpc} -%{python_sitearch}/numpy/*/*/*.c -%{python_sitearch}/numpy/*/*.h -%{python_sitearch}/numpy/*/*/*.h -%{python_sitearch}/numpy/*/*/*/*.h +%{python_sitearch}/numpy/core/include/ +%{python_sitearch}/numpy/distutils/mingw/gfortran_vs2003_hack.c +%{python_sitearch}/numpy/f2py/src/ %{python_sitearch}/numpy/core/lib/libnpymath.a %else -%{p_python_sitearch}/numpy/*/*/*.c -%{p_python_sitearch}/numpy/*/*.h -%{p_python_sitearch}/numpy/*/*/*.h -%{p_python_sitearch}/numpy/*/*/*/*.h +%{p_python_sitearch}/numpy/core/include/ %{p_python_sitearch}/numpy/core/lib/libnpymath.a +%{p_python_sitearch}/numpy/distutils/mingw/gfortran_vs2003_hack.c +%{p_python_sitearch}/numpy/f2py/src/ %endif %changelog