Accepting request 486233 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/486233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=53

numpy-1.12.0.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff320ecfe41c6581c8981dce892fe6d7e69806459a899e294e4bf8229737b154
-size 4821432

numpy-1.12.1.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542
+size 4824784

python-numpy-doc.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Apr  6 16:44:43 UTC 2017 - toddrme2178@gmail.com
+
+- Update to version 1.12.1
+  * Fix wrong future nat warning and equiv type logic error...
+  * Fix wrong masked median for some special cases
+  * Place np.average in inline code
+  * Work around isfinite inconsistency on i386
+  * Guard against replacing constants without '_' spec in f2py.
+  * Fix mean for float 16 non-array inputs for 1.12
+  * Fix calling python api with error set and minor leaks for...
+  * Make iscomplexobj compatible with custom dtypes again
+  * Fix undefined behaviour induced by bad __array_wrap__
+  * Fix MaskedArray.__setitem__
+  * PPC64el machines are POWER for Fortran in f2py
+  * Look up methods on MaskedArray in `_frommethod`
+  * Remove extra digit in binary_repr at limit
+  * Fix deepcopy regression for empty arrays.
+  * Fix ma.median for empty ndarrays
+
+-------------------------------------------------------------------
+Fri Feb 17 15:19:47 UTC 2017 - toddrme2178@gmail.com
+
+- Switch to single-spec version
+
 -------------------------------------------------------------------
 Sat Jan 21 15:07:23 UTC 2017 - toddrme2178@gmail.com
 

python-numpy-doc.spec

@@ -16,23 +16,8 @@
 #
 
 
-%define modname numpy
-%define docname numpydoc
-%define docvers 0.4
-%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.12.0
+Version:        1.12.1
 Release:        0
 Summary:        Documentation for python-numpy
 License:        BSD-3-Clause
@@ -43,32 +28,27 @@ Source:         https://pypi.io/packages/source/n/numpy/numpy-%{version}.zip
 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
-BuildRequires:  blas-devel
+BuildRequires:  python3-Sphinx
-BuildRequires:  lapack-devel
+BuildRequires:  python3-devel
-BuildRequires:  python-Sphinx
+BuildRequires:  python3-matplotlib
-BuildRequires:  python-devel
+BuildRequires:  python3-numpy-devel = %{version}
-BuildRequires:  python-matplotlib
+BuildRequires:  python3-numpydoc
-BuildRequires:  python-numpy-devel = %{version}
+BuildRequires:  python3-setuptools
-BuildRequires:  python-numpydoc
+BuildRequires:  zip
-BuildRequires:  python-setuptools
-BuildRequires: zip
 BuildRequires:  unzip
+BuildRequires:  fdupes
+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-pdf = %{version}
+Obsoletes:      python2-numpy-doc-html < %{version}
+Obsoletes:      python3-numpy-doc-html < %{version}
+Obsoletes:      python2-numpy-doc-pdf < %{version}
+Obsoletes:      python3-numpy-doc-pdf < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
+BuildArch:      noarch
-BuildRequires:  cblas-devel
-%endif
-# LaTeX requirements, not available on SLES
-%if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
-BuildRequires:  python-Sphinx-latex
-BuildRequires:  tex(a4wide.sty)
-BuildRequires:  tex(abstract.sty)
-BuildRequires:  tex(amsmath.sty)
-BuildRequires:  tex(article.cls)
-BuildRequires:  tex(epsfig.sty)
-BuildRequires:  tex(expdlist.sty)
-BuildRequires:  tex(verbatim.sty)
-BuildRequires:  tex(xspace.sty)
-%endif
 
 %description
 NumPy is a general-purpose array-processing package designed to
@@ -84,43 +64,6 @@ basic linear algebra and random number generation.
 
 This package provides the documentation for NumPy
 
-%package html
-Summary:        HTML documentation for python-numpy
-Group:          Development/Libraries/Python
-Recommends:     python-numpy = %{version}
-
-%description html
-NumPy is a general-purpose array-processing package designed to
-efficiently manipulate large multi-dimensional arrays of arbitrary
-records without sacrificing too much speed for small multi-dimensional
-arrays.  NumPy is built on the Numeric code base and adds features
-introduced by numarray as well as an extended C-API and the ability to
-create arrays of arbitrary type which also makes NumPy suitable for
-interfacing with general-purpose data-base applications.
-
-There are also basic facilities for discrete fourier transform,
-basic linear algebra and random number generation.
-
-This package provides the HTML documentation for NumPy
-
-%package pdf
-Summary:        PDF documentation for python-numpy
-Group:          Development/Libraries/Python
-Recommends:     python-numpy = %{version}
-
-%description pdf
-NumPy is a general-purpose array-processing package designed to
-efficiently manipulate large multi-dimensional arrays of arbitrary
-records without sacrificing too much speed for small multi-dimensional
-arrays.  NumPy is built on the Numeric code base and adds features
-introduced by numarray as well as an extended C-API and the ability to
-create arrays of arbitrary type which also makes NumPy suitable for
-interfacing with general-purpose data-base applications.
-
-There are also basic facilities for discrete fourier transform,
-basic linear algebra and random number generation.
-
-This package provides the PDF documentation for NumPy
 
 %prep
 %setup -q -n numpy-%{version}
@@ -129,46 +72,23 @@ This package provides the PDF 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=%{py_ver}
+make html PYVER=%{py3_ver}
 popd
 
-# LaTeX building currently broken
-# %if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
-# pushd doc
-# make latex PYVER=%{py_ver}
-# make -C build/latex all-pdf PYVER=%{py_ver}
-# popd
-# %endif
 
 %install
 # install the documentation
 mkdir -p %{buildroot}%{_docdir}/python-numpy/
-
+cp -r doc/build/html %{buildroot}%{_docdir}/python-numpy/
-pushd doc/build
-cp -r html %{buildroot}%{_docdir}/python-numpy/
-popd
 %fdupes %{buildroot}%{_docdir}/python-numpy/html/
 
-# LaTeX building currently broken
-# %if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
-# pushd doc/build
-# cp -r pdf %{buildroot}%{_docdir}/python-numpy/
-# popd
-# %fdupes %{buildroot}%{_docdir}/python-numpy/pdf/
-# %endif
 
-%files html
+%files
 %defattr(-,root,root)
-%{_docdir}/python-numpy/html/
+%{_docdir}/python-numpy/
-
-# LaTeX building currently broken
-# %if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
-# %files pdf
-# %defattr(-,root,root)
-# %{_docdir}/python-numpy/pdf/
-# %endif
 
 %changelog

python-numpy.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Thu Apr  6 16:44:43 UTC 2017 - toddrme2178@gmail.com
+
+- Update to version 1.12.1
+  * Fix wrong future nat warning and equiv type logic error...
+  * Fix wrong masked median for some special cases
+  * Place np.average in inline code
+  * Work around isfinite inconsistency on i386
+  * Guard against replacing constants without '_' spec in f2py.
+  * Fix mean for float 16 non-array inputs for 1.12
+  * Fix calling python api with error set and minor leaks for...
+  * Make iscomplexobj compatible with custom dtypes again
+  * Fix undefined behaviour induced by bad __array_wrap__
+  * Fix MaskedArray.__setitem__
+  * PPC64el machines are POWER for Fortran in f2py
+  * Look up methods on MaskedArray in `_frommethod`
+  * Remove extra digit in binary_repr at limit
+  * Fix deepcopy regression for empty arrays.
+  * Fix ma.median for empty ndarrays
+- Further updates to macro usage.
+
+-------------------------------------------------------------------
+Mon Feb 27 18:21:12 UTC 2017 - toddrme2178@gmail.com
+
+- Fix macro usage.
+
+-------------------------------------------------------------------
+Thu Feb 23 18:36:54 UTC 2017 - toddrme2178@gmail.com
+
+- Fix -devel package dependency
+
+-------------------------------------------------------------------
+Fri Feb 17 15:19:37 UTC 2017 - toddrme2178@gmail.com
+
+- Switch to single-spec version
+
 -------------------------------------------------------------------
 Tue Jan 17 17:24:28 UTC 2017 - toddrme2178@gmail.com
 

python-numpy.spec

@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %if 0%{?is_opensuse} == 0
 %bcond_with openblas
 %else
@@ -37,8 +38,10 @@
 %endif
 %endif
 
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-numpy
-Version:        1.12.0
+Version:        1.12.1
 Release:        0
 Summary:        NumPy array processing for numbers, strings, records and objects
 License:        BSD-3-Clause
@@ -50,29 +53,21 @@ 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
 BuildRequires:  blas-devel
+BuildRequires:  fdupes
+BuildRequires:  gcc-fortran
 BuildRequires:  lapack-devel
 BuildRequires:  unzip
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module Cython}
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
 %if %{with openblas}
 BuildRequires:  openblas-devel
 %endif
-BuildRequires:  python-devel >= 2.6
-BuildRequires:  python-setuptools
-%if 0%{?suse_version} <= 1110
-%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-%if 0%{?suse_version}
-BuildRequires:  fdupes
-BuildRequires:  gcc-fortran
-%else
-BuildRequires:  gcc-gfortran
-%endif
-%if ! 0%{?fedora_version}
-Provides:       python-numeric = %{version}
-Obsoletes:      python-numeric < %{version}
-%endif
-Provides:       numpy = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%python_subpackages
+
 %description
 NumPy is a general-purpose array-processing package designed to
 efficiently manipulate large multi-dimensional arrays of arbitrary
@@ -85,25 +80,23 @@ interfacing with general-purpose data-base applications.
 There are also basic facilities for discrete fourier transform,
 basic linear algebra and random number generation.
 
+
 %package devel
 Summary:        Development files for numpy applications
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       blas-devel
-Requires:       lapack-devel
-Requires:       python-devel >= %{py_ver}
-%if %{with openblas}
-BuildRequires:  openblas-devel
-%endif
-%if 0%{?suse_version}
 Requires:       gcc-fortran
-%else
+Requires:       lapack-devel
-Requires:       gcc-gfortran
+Requires:       python-devel
+%if %{with openblas}
+Requires:       openblas-devel
 %endif
 
 %description devel
 This package contains files for developing applications using numpy.
 
+
 %prep
 %setup -q -n numpy-%{version}
 %patch0 -p1
@@ -111,20 +104,23 @@ This package contains files for developing applications using numpy.
 # Fix non-executable scripts
 sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,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
-CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%python_build
+
 
 %install
-python setup.py install --root=%{buildroot} --prefix="%{_prefix}"
+%python_exec setup.py install --prefix=%{_prefix} --root=%{buildroot}
-rm -rf %{buildroot}%{python_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite
+%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
-%if 0%{?suse_version}
+%fdupes %{buildroot}%{prefix}
-%fdupes -s %{buildroot}%{_prefix}
-%endif
 
-%files
+
+%files %{python_files}
 %defattr(-,root,root)
 %doc *.txt
-%{_bindir}/f2py
+%python2_only %{_bindir}/f2py2
+%python3_only %{_bindir}/f2py3
 %{python_sitearch}/numpy/
 %{python_sitearch}/numpy-%{version}-py*.egg-info
 %exclude %{python_sitearch}/numpy/*/*/*.c
@@ -133,8 +129,10 @@ rm -rf %{buildroot}%{python_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg
 %exclude %{python_sitearch}/numpy/*/*/*/*.h
 %exclude %{python_sitearch}/numpy/core/lib/libnpymath.a
 
-%files devel
+
+%files %{python_files devel}
 %defattr(-,root,root)
+%doc LICENSE.txt
 %{python_sitearch}/numpy/*/*/*.c
 %{python_sitearch}/numpy/*/*.h
 %{python_sitearch}/numpy/*/*/*.h