From d68f7cec034cefefe34b15c364ea6d8813b425f805a66d3ffb1dde896461c39c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 17 Sep 2016 12:34:03 +0000 Subject: [PATCH] Accepting request 426983 from devel:languages:python - use pypi.io as Source URL - Don't include cblas-devel on SLES 12 - update to 1.11.1: - #7506 BUG: Make sure numpy imports on python 2.6 when nose is unavailable. - #7530 BUG: Floating exception with invalid axis in np.lexsort. - #7535 BUG: Extend glibc complex trig functions blacklist to glibc < 2.18. - #7551 BUG: Allow graceful recovery for no compiler. - #7558 BUG: Constant padding expected wrong type in constant_values. - #7578 BUG: Fix OverflowError in Python 3.x. in swig interface. - #7590 BLD: Fix configparser.InterpolationSyntaxError. - #7597 BUG: Make np.ma.take work on scalars. - #7608 BUG: linalg.norm(): Don't convert object arrays to float. - #7638 BLD: Correct C compiler customization in system_info.py. - #7654 BUG: ma.median of 1d array should return a scalar. - #7656 BLD: Remove hardcoded Intel compiler flag -xSSE4.2. - #7660 BUG: Temporary fix for str(mvoid) for object field types. - #7665 BUG: Fix incorrect printing of 1D masked arrays. - #7670 BUG: Correct initial index estimate in histogram. - #7671 BUG: Boolean assignment no GIL release when transfer needs API. - #7676 BUG: Fix handling of right edge of final histogram bin. - #7680 BUG: Fix np.clip bug NaN handling for Visual Studio 2015. - #7724 BUG: Fix segfaults in np.random.shuffle. - #7731 MAINT: Change mkl_info.dir_env_var from MKL to MKLROOT. OBS-URL: https://build.opensuse.org/request/show/426983 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=50 --- numpy-1.11.0.tar.gz | 3 --- numpy-1.11.1.tar.gz | 3 +++ python-numpy-doc.spec | 51 +++++++++++++++++++++---------------------- python-numpy.changes | 36 ++++++++++++++++++++++++++++++ python-numpy.spec | 47 +++++++++++++++++++-------------------- 5 files changed, 87 insertions(+), 53 deletions(-) delete mode 100644 numpy-1.11.0.tar.gz create mode 100644 numpy-1.11.1.tar.gz diff --git a/numpy-1.11.0.tar.gz b/numpy-1.11.0.tar.gz deleted file mode 100644 index c9440d7..0000000 --- a/numpy-1.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e -size 4169494 diff --git a/numpy-1.11.1.tar.gz b/numpy-1.11.1.tar.gz new file mode 100644 index 0000000..426b853 --- /dev/null +++ b/numpy-1.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc4082c43979cc856a2bf352a8297ea109ccb3244d783ae067eb2ee5b0d577cd +size 4171162 diff --git a/python-numpy-doc.spec b/python-numpy-doc.spec index fc94935..598e699 100644 --- a/python-numpy-doc.spec +++ b/python-numpy-doc.spec @@ -17,28 +17,36 @@ %define modname numpy -Name: python-numpy-doc %define docname numpydoc -Version: 1.11.0 -Release: 0 %define docvers 0.4 -Url: http://www.numpy.org/ +%if 0%{?suse_version} +%if 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%else +BuildArch: noarch +%py_requires +%endif +BuildRequires: fdupes +BuildRequires: gcc-fortran +%else +BuildRequires: gcc-gfortran +%endif +Name: python-numpy-doc +Version: 1.11.1 +Release: 0 Summary: Documentation for python-numpy License: BSD-3-Clause Group: Development/Libraries/Python -Source: https://pypi.python.org/packages/source/n/numpy/numpy-%{version}.tar.gz +Url: http://www.numpy.org/ +Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.tar.gz # PATCH-FIX-OPENSUSE numpy-buildfix.patch -- openSUSE-specific build fixes Patch0: numpy-buildfix.patch # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure Patch1: numpy-1.9.0-remove-__declspec.patch # PATCH-FIX-OPENSUSE numpy-1.10.4-cblas.patch -- fix for building with system cblas. -Patch2: numpy-1.10.4-cblas.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch2: numpy-1.10.4-cblas.patch BuildRequires: blas-devel BuildRequires: lapack-devel -%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315 -BuildRequires: cblas-devel -%endif BuildRequires: python-Sphinx BuildRequires: python-devel BuildRequires: python-matplotlib @@ -46,6 +54,10 @@ BuildRequires: python-numpy-devel = %{version} BuildRequires: python-numpydoc BuildRequires: python-setuptools BuildRequires: zip +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +BuildRequires: cblas-devel +%endif # LaTeX requirements, not available on SLES %if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315 BuildRequires: python-Sphinx-latex @@ -58,18 +70,6 @@ BuildRequires: tex(expdlist.sty) BuildRequires: tex(verbatim.sty) BuildRequires: tex(xspace.sty) %endif -%if 0%{?suse_version} -BuildRequires: fdupes -BuildRequires: gcc-fortran -%if 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%else -BuildArch: noarch -%py_requires -%endif -%else -BuildRequires: gcc-gfortran -%endif %description NumPy is a general-purpose array-processing package designed to @@ -123,12 +123,11 @@ basic linear algebra and random number generation. This package provides the PDF documentation for NumPy - %prep %setup -q -n numpy-%{version} %patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} > 1320 || 0%{suse_version} == 1315 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 %patch2 -p1 %endif # drop build date from doc to fix build-compare @@ -136,13 +135,13 @@ sed -i "s/\(html_last_updated_fmt = \).*/\\1None/" doc/source/conf.py %build # make the documentation -pushd doc +pushd doc make html PYVER=%{py_ver} popd # LaTeX building currently broken # %if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315 -# pushd doc +# pushd doc # make latex PYVER=%{py_ver} # make -C build/latex all-pdf PYVER=%{py_ver} # popd diff --git a/python-numpy.changes b/python-numpy.changes index 94af0b3..78b3df8 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Mon Sep 12 10:50:33 UTC 2016 - dmueller@suse.com + +- use pypi.io as Source URL + +------------------------------------------------------------------- +Tue Sep 6 07:19:07 UTC 2016 - jweberhofer@weberhofer.at + +- Don't include cblas-devel on SLES 12 + +------------------------------------------------------------------- +Fri Jul 8 09:41:40 UTC 2016 - dmueller@suse.com + +- update to 1.11.1: + - #7506 BUG: Make sure numpy imports on python 2.6 when nose is unavailable. + - #7530 BUG: Floating exception with invalid axis in np.lexsort. + - #7535 BUG: Extend glibc complex trig functions blacklist to glibc < 2.18. + - #7551 BUG: Allow graceful recovery for no compiler. + - #7558 BUG: Constant padding expected wrong type in constant_values. + - #7578 BUG: Fix OverflowError in Python 3.x. in swig interface. + - #7590 BLD: Fix configparser.InterpolationSyntaxError. + - #7597 BUG: Make np.ma.take work on scalars. + - #7608 BUG: linalg.norm(): Don't convert object arrays to float. + - #7638 BLD: Correct C compiler customization in system_info.py. + - #7654 BUG: ma.median of 1d array should return a scalar. + - #7656 BLD: Remove hardcoded Intel compiler flag -xSSE4.2. + - #7660 BUG: Temporary fix for str(mvoid) for object field types. + - #7665 BUG: Fix incorrect printing of 1D masked arrays. + - #7670 BUG: Correct initial index estimate in histogram. + - #7671 BUG: Boolean assignment no GIL release when transfer needs API. + - #7676 BUG: Fix handling of right edge of final histogram bin. + - #7680 BUG: Fix np.clip bug NaN handling for Visual Studio 2015. + - #7724 BUG: Fix segfaults in np.random.shuffle. + - #7731 MAINT: Change mkl_info.dir_env_var from MKL to MKLROOT. + + ------------------------------------------------------------------- Mon Apr 4 16:15:27 UTC 2016 - toddrme2178@gmail.com diff --git a/python-numpy.spec b/python-numpy.spec index ecd7d00..30cc592 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -17,49 +17,48 @@ %define with_atlas 0 - +%if 0%{?suse_version} +%if 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%else +%py_requires +%endif +BuildRequires: fdupes +BuildRequires: gcc-fortran +%else +%if ! 0%{?fedora_version} +Provides: python-numeric = %{version} +Obsoletes: python-numeric < %{version} +%endif +BuildRequires: gcc-gfortran +%endif Name: python-numpy -Version: 1.11.0 +Version: 1.11.1 Release: 0 -Url: http://www.numpy.org/ Summary: NumPy array processing for numbers, strings, records and objects License: BSD-3-Clause Group: Development/Libraries/Python -Source: https://pypi.python.org/packages/source/n/numpy/numpy-%{version}.tar.gz +Url: http://www.numpy.org/ +Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.tar.gz # PATCH-FIX-OPENSUSE numpy-buildfix.patch -- openSUSE-specific build fixes Patch0: numpy-buildfix.patch # PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure Patch1: numpy-1.9.0-remove-__declspec.patch # PATCH-FIX-OPENSUSE numpy-1.10.4-cblas.patch -- fix for building with system cblas. Patch2: numpy-1.10.4-cblas.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 -BuildRequires: cblas-devel -%endif BuildRequires: lapack-devel BuildRequires: python-devel >= 2.6 BuildRequires: python-setuptools Requires: python >= %{py_ver} Provides: numpy = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?is_opensuse} && ( 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 ) +BuildRequires: cblas-devel +%endif %if %{with_atlas} == 1 BuildRequires: libatlas3-devel %endif -%if 0%{?suse_version} -BuildRequires: fdupes -BuildRequires: gcc-fortran -%if 0%{?suse_version} <= 1110 -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%else -%py_requires -%endif -%else -BuildRequires: gcc-gfortran -%if ! 0%{?fedora_version} -Provides: python-numeric = %{version} -Obsoletes: python-numeric < %{version} -%endif -%endif %description NumPy is a general-purpose array-processing package designed to @@ -110,7 +109,7 @@ sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,fr CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build %install -python setup.py install --root="%{buildroot}" --prefix="%{_prefix}" +python setup.py install --root=%{buildroot} --prefix="%{_prefix}" rm -rf %{buildroot}%{python_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite %if 0%{?suse_version} %fdupes -s %{buildroot}%{_prefix}