From c709c31ae8cdbb7a4e46dc7597128c19f66e16ca39dafc7a403e5d52cb6b5f70 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Oct 2017 15:47:16 +0000 Subject: [PATCH] Accepting request 530444 from devel:languages:python 1 OBS-URL: https://build.opensuse.org/request/show/530444 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=57 --- numpy-1.13.1.zip | 3 -- numpy-1.13.3.zip | 3 ++ numpy-1.9.0-remove-__declspec.patch | 2 +- numpy-buildfix.patch | 2 +- python-numpy-doc.changes | 59 +++++++++++++++++++++++++++++ python-numpy-doc.spec | 13 +++---- python-numpy.changes | 59 +++++++++++++++++++++++++++++ python-numpy.spec | 13 ++----- 8 files changed, 132 insertions(+), 22 deletions(-) delete mode 100644 numpy-1.13.1.zip create mode 100644 numpy-1.13.3.zip diff --git a/numpy-1.13.1.zip b/numpy-1.13.1.zip deleted file mode 100644 index f53f811..0000000 --- a/numpy-1.13.1.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb -size 5012881 diff --git a/numpy-1.13.3.zip b/numpy-1.13.3.zip new file mode 100644 index 0000000..d8d3be1 --- /dev/null +++ b/numpy-1.13.3.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750 +size 5021189 diff --git a/numpy-1.9.0-remove-__declspec.patch b/numpy-1.9.0-remove-__declspec.patch index 25bd94c..f8d5764 100644 --- a/numpy-1.9.0-remove-__declspec.patch +++ b/numpy-1.9.0-remove-__declspec.patch @@ -15,7 +15,7 @@ safely removed. --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py -@@ -140,7 +140,7 @@ +@@ -163,7 +163,7 @@ ] # variable attributes tested via "int %s a" % attribute diff --git a/numpy-buildfix.patch b/numpy-buildfix.patch index 94911ab..83f86bf 100644 --- a/numpy-buildfix.patch +++ b/numpy-buildfix.patch @@ -1,6 +1,6 @@ --- a/numpy/distutils/command/autodist.py +++ b/numpy/distutils/command/autodist.py -@@ -32,7 +32,7 @@ +@@ -49,7 +49,7 @@ """Return True if the C compiler is GCC 4.x.""" cmd._check_compiler() body = """ diff --git a/python-numpy-doc.changes b/python-numpy-doc.changes index 06c6fb4..c0364aa 100644 --- a/python-numpy-doc.changes +++ b/python-numpy-doc.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Sat Sep 30 16:20:39 UTC 2017 - arun@gmx.de + +- updated line numbers in patches + +- update to version 1.13.3: + * #9390 BUG: Return the poly1d coefficients array directly + * #9555 BUG: Fix regression in 1.13.x in distutils.mingw32ccompiler. + * #9556 BUG: Fix true_divide when dtype=np.float64 specified. + * #9557 DOC: Fix some rst markup in numpy/doc/basics.py. + * #9558 BLD: Remove -xhost flag from IntelFCompiler. + * #9559 DOC: Removes broken docstring example (source code, png, + pdf)... + * #9580 BUG: Add hypot and cabs functions to WIN32 blacklist. + * #9732 BUG: Make scalar function elision check if temp is + writeable. + * #9736 BUG: Various fixes to np.gradient + * #9742 BUG: Fix np.pad for CVE-2017-12852 + * #9744 BUG: Check for exception in sort functions, add tests + * #9745 DOC: Add whitespace after "versionadded::" directive so it + actually... + * #9746 BUG: Memory leak in np.dot of size 0 + * #9747 BUG: Adjust gfortran version search regex + * #9757 BUG: Cython 0.27 breaks NumPy on Python 3. + * #9764 BUG: Ensure _npy_scaled_cexp{,f,l} is defined when needed. + * #9765 BUG: PyArray_CountNonzero does not check for exceptions + * #9766 BUG: Fixes histogram monotonicity check for unsigned bin + values + * #9767 BUG: Ensure consistent result dtype of count_nonzero + * #9771 BUG: MAINT: Fix mtrand for Cython 0.27. + * #9772 DOC: Create the 1.13.2 release notes. + * #9794 DOC: Create 1.13.3 release notes. + +- changes from version 1.13.2: + * #9390 BUG: Return the poly1d coefficients array directly + * #9555 BUG: Fix regression in 1.13.x in distutils.mingw32ccompiler. + * #9556 BUG: Fix true_divide when dtype=np.float64 specified. + * #9557 DOC: Fix some rst markup in numpy/doc/basics.py. + * #9558 BLD: Remove -xhost flag from IntelFCompiler. + * #9559 DOC: Removes broken docstring example (source code, png, + pdf)... + * #9580 BUG: Add hypot and cabs functions to WIN32 blacklist. + * #9732 BUG: Make scalar function elision check if temp is + writeable. + * #9736 BUG: Various fixes to np.gradient + * #9742 BUG: Fix np.pad for CVE-2017-12852 + * #9744 BUG: Check for exception in sort functions, add tests + * #9745 DOC: Add whitespace after "versionadded::" directive so it + actually... + * #9746 BUG: Memory leak in np.dot of size 0 + * #9747 BUG: Adjust gfortran version search regex + * #9757 BUG: Cython 0.27 breaks NumPy on Python 3. + * #9764 BUG: Ensure _npy_scaled_cexp{,f,l} is defined when needed. + * #9765 BUG: PyArray_CountNonzero does not check for exceptions + * #9766 BUG: Fixes histogram monotonicity check for unsigned bin + values + * #9767 BUG: Ensure consistent result dtype of count_nonzero + * #9771 BUG, MAINT: Fix mtrand for Cython 0.27. + ------------------------------------------------------------------- Mon Sep 18 14:40:26 UTC 2017 - hsk17@mail.de diff --git a/python-numpy-doc.spec b/python-numpy-doc.spec index e81cc36..90fef09 100644 --- a/python-numpy-doc.spec +++ b/python-numpy-doc.spec @@ -17,7 +17,7 @@ Name: python-numpy-doc -Version: 1.13.1 +Version: 1.13.3 Release: 0 Summary: Documentation for python-numpy License: BSD-3-Clause @@ -34,20 +34,20 @@ BuildRequires: python3-matplotlib BuildRequires: python3-numpy-devel = %{version} BuildRequires: python3-numpydoc BuildRequires: python3-setuptools -BuildRequires: zip BuildRequires: unzip +BuildRequires: zip %if 0%{?suse_version} BuildRequires: fdupes %endif Provides: python2-numpy-doc = %{version} -Provides: python3-numpy-doc = %{version} Provides: python2-numpy-doc-html = %{version} -Provides: python3-numpy-doc-html = %{version} Provides: python2-numpy-doc-pdf = %{version} +Provides: python3-numpy-doc = %{version} +Provides: python3-numpy-doc-html = %{version} Provides: python3-numpy-doc-pdf = %{version} Obsoletes: python2-numpy-doc-html < %{version} -Obsoletes: python3-numpy-doc-html < %{version} Obsoletes: python2-numpy-doc-pdf < %{version} +Obsoletes: python3-numpy-doc-html < %{version} Obsoletes: python3-numpy-doc-pdf < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -74,14 +74,12 @@ This package provides the documentation for NumPy # drop build date from doc to fix build-compare sed -i "s/\(html_last_updated_fmt = \).*/\\1None/" doc/source/conf.py - %build # make the documentation pushd doc make html PYVER=%{py3_ver} popd - %install # install the documentation mkdir -p %{buildroot}%{_docdir}/python-numpy/ @@ -90,7 +88,6 @@ cp -r doc/build/html %{buildroot}%{_docdir}/python-numpy/ %fdupes %{buildroot}%{_docdir}/python-numpy/html/ %endif - %files %defattr(-,root,root) %{_docdir}/python-numpy/ diff --git a/python-numpy.changes b/python-numpy.changes index 95b8af1..1a08313 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Sat Sep 30 16:20:39 UTC 2017 - arun@gmx.de + +- updated line numbers in patches + +- update to version 1.13.3: + * #9390 BUG: Return the poly1d coefficients array directly + * #9555 BUG: Fix regression in 1.13.x in distutils.mingw32ccompiler. + * #9556 BUG: Fix true_divide when dtype=np.float64 specified. + * #9557 DOC: Fix some rst markup in numpy/doc/basics.py. + * #9558 BLD: Remove -xhost flag from IntelFCompiler. + * #9559 DOC: Removes broken docstring example (source code, png, + pdf)... + * #9580 BUG: Add hypot and cabs functions to WIN32 blacklist. + * #9732 BUG: Make scalar function elision check if temp is + writeable. + * #9736 BUG: Various fixes to np.gradient + * #9742 BUG: Fix np.pad for CVE-2017-12852 + * #9744 BUG: Check for exception in sort functions, add tests + * #9745 DOC: Add whitespace after "versionadded::" directive so it + actually... + * #9746 BUG: Memory leak in np.dot of size 0 + * #9747 BUG: Adjust gfortran version search regex + * #9757 BUG: Cython 0.27 breaks NumPy on Python 3. + * #9764 BUG: Ensure _npy_scaled_cexp{,f,l} is defined when needed. + * #9765 BUG: PyArray_CountNonzero does not check for exceptions + * #9766 BUG: Fixes histogram monotonicity check for unsigned bin + values + * #9767 BUG: Ensure consistent result dtype of count_nonzero + * #9771 BUG: MAINT: Fix mtrand for Cython 0.27. + * #9772 DOC: Create the 1.13.2 release notes. + * #9794 DOC: Create 1.13.3 release notes. + +- changes from version 1.13.2: + * #9390 BUG: Return the poly1d coefficients array directly + * #9555 BUG: Fix regression in 1.13.x in distutils.mingw32ccompiler. + * #9556 BUG: Fix true_divide when dtype=np.float64 specified. + * #9557 DOC: Fix some rst markup in numpy/doc/basics.py. + * #9558 BLD: Remove -xhost flag from IntelFCompiler. + * #9559 DOC: Removes broken docstring example (source code, png, + pdf)... + * #9580 BUG: Add hypot and cabs functions to WIN32 blacklist. + * #9732 BUG: Make scalar function elision check if temp is + writeable. + * #9736 BUG: Various fixes to np.gradient + * #9742 BUG: Fix np.pad for CVE-2017-12852 + * #9744 BUG: Check for exception in sort functions, add tests + * #9745 DOC: Add whitespace after "versionadded::" directive so it + actually... + * #9746 BUG: Memory leak in np.dot of size 0 + * #9747 BUG: Adjust gfortran version search regex + * #9757 BUG: Cython 0.27 breaks NumPy on Python 3. + * #9764 BUG: Ensure _npy_scaled_cexp{,f,l} is defined when needed. + * #9765 BUG: PyArray_CountNonzero does not check for exceptions + * #9766 BUG: Fixes histogram monotonicity check for unsigned bin + values + * #9767 BUG: Ensure consistent result dtype of count_nonzero + * #9771 BUG, MAINT: Fix mtrand for Cython 0.27. + ------------------------------------------------------------------- Mon Sep 18 14:40:26 UTC 2017 - hsk17@mail.de diff --git a/python-numpy.spec b/python-numpy.spec index 7429745..0c0c9b4 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -38,10 +38,9 @@ %endif %endif - %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-numpy -Version: 1.13.1 +Version: 1.13.3 Release: 0 Summary: NumPy array processing for numbers, strings, records and objects License: BSD-3-Clause @@ -61,12 +60,12 @@ BuildRequires: gcc-fortran %else BuildRequires: gcc-gfortran %endif -BuildRequires: lapack-devel -BuildRequires: unzip -BuildRequires: python-rpm-macros BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: lapack-devel +BuildRequires: python-rpm-macros +BuildRequires: unzip %if %{with openblas} BuildRequires: openblas-devel %endif @@ -114,12 +113,10 @@ This package contains files for developing applications using numpy. # Fix non-executable scripts sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py - %build export CFLAGS="%{optflags} -fno-strict-aliasing" %python_build - %install %python_exec setup.py install --prefix=%{_prefix} --root=%{buildroot} %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 @@ -127,7 +124,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %fdupes %{buildroot}%{prefix} %endif - %files %{python_files} %defattr(-,root,root) %doc *.txt @@ -141,7 +137,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %exclude %{python_sitearch}/numpy/*/*/*/*.h %exclude %{python_sitearch}/numpy/core/lib/libnpymath.a - %files %{python_files devel} %defattr(-,root,root) %doc LICENSE.txt