Accepting request 206776 from devel:languages:python

Update to 1.8.0

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

numpy-1.7.1.tar.gz

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

numpy-1.8.0.tar.gz

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

numpy-buildfix.patch

@@ -1,21 +1,6 @@
-Index: numpy/distutils/command/install.py
+--- a/numpy/distutils/command/autodist.py
-===================================================================
++++ b/numpy/distutils/command/autodist.py
---- numpy/distutils/command/install.py.orig	2010-08-04 12:53:20.000000000 +0200
+@@ -32,7 +32,7 @@
-+++ numpy/distutils/command/install.py	2010-09-06 10:29:18.119261319 +0200
-@@ -64,7 +64,7 @@ class install(old_install):
-             need_rewrite = False
-             for l in f.readlines():
-                 l = l.rstrip()
--                if ' ' in l:
-+                if ' ' in l and '%dir ' not in l:
-                     need_rewrite = True
-                     l = '"%s"' % (l)
-                 lines.append(l)
-Index: numpy/distutils/command/autodist.py
-===================================================================
---- numpy/distutils/command/autodist.py.orig	2010-08-04 12:53:20.000000000 +0200
-+++ numpy/distutils/command/autodist.py	2010-09-06 10:29:31.835385151 +0200
-@@ -28,7 +28,7 @@ def check_compiler_gcc4(cmd):
      """Return True if the C compiler is GCC 4.x."""
      cmd._check_compiler()
      body = """
@@ -24,3 +9,15 @@ Index: numpy/distutils/command/autodist.py
  main()
  {
  #ifndef __GNUC__ && (__GNUC__ >= 4)
+
+--- a/numpy/distutils/command/install.py
++++ b/numpy/distutils/command/install.py
+@@ -66,7 +66,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)

python-numpy-doc.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Oct 31 10:17:25 UTC 2013 - toddrme2178@gmail.com
+
+- Update to 1.8.0
+  Highlights:
+  * New, no 2to3, Python 2 and Python 3 are supported by a common code base. 
+  * New, gufuncs for linear algebra, enabling operations on stacked arrays. 
+  * New, inplace fancy indexing for ufuncs with the ``.at`` method. 
+  * New, ``partition`` function, partial sorting via selection for fast median. 
+  * New, ``nanmean``, ``nanvar``, and ``nanstd`` functions skipping NaNs. 
+  * New, ``full`` and ``full_like`` functions to create value initialized arrays. 
+  * New, ``PyUFunc_RegisterLoopForDescr``, better ufunc support for user dtypes. 
+  * Numerous performance improvements in many areas.
+- Add a new flag to easily enable/disable atlas support for if it
+  ever gets fixed in the future
+- Rebase numpy-buildfix.patch
+
 -------------------------------------------------------------------
 Thu Aug  1 11:52:47 UTC 2013 - speilicke@suse.com
 

python-numpy-doc.spec

@@ -19,7 +19,7 @@
 %define modname numpy
 Name:           python-%{modname}-doc
 %define docname numpydoc
-Version:        1.7.1
+Version:        1.8.0
 Release:        0
 %define docvers 0.4
 Url:            http://sourceforge.net/projects/numpy
@@ -27,7 +27,7 @@ Summary:        Documentation for python-numpy
 License:        BSD-3-Clause
 Group:          Development/Libraries/Python
 Source:         %{modname}-%{version}.tar.gz
-Patch1:         numpy-buildfix.patch
+Patch0:         numpy-buildfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  blas-devel
 BuildRequires:  lapack-devel
@@ -35,10 +35,9 @@ BuildRequires:  python-Sphinx
 BuildRequires:  python-devel
 BuildRequires:  python-matplotlib
 BuildRequires:  python-numpy-devel
+BuildRequires:  python-numpydoc
 BuildRequires:  texlive-latex
 BuildRequires:  zip
-Provides:       python-numpydoc = %{version}
-Obsoletes:      python-numpydoc < %{version}
 %if 0%{?suse_version}
 BuildRequires:  fdupes
 BuildRequires:  gcc-fortran
@@ -104,50 +103,16 @@ basic linear algebra and random number generation.
 
 This package provides the PDF documentation for NumPy
 
-%package -n python-numpydoc
-Summary:        Custom extension for python-Sphinx from the python-numpy project
-Group:          Development/Libraries/Python
-Requires:       python-Sphinx
-%if 0%{?suse_version} > 1110
-%{py_requires}
-%endif
-
-%description -n python-numpydoc
-Numpy's documentation uses several custom extensions to Sphinx. These are
-shipped in this numpydoc package, in case you want to make use of them in
-third-party projects.
-
-The following extensions are available:
-
-- numpydoc: support for the Numpy docstring format in Sphinx, and add the code
-description directives np:function, np-c:function, etc. that support the Numpy
-docstring syntax.
-
-- numpydoc.traitsdoc: For gathering documentation about Traits attributes.
-
-- numpydoc.plot_directives: Adaptation of Matplotlib's plot:: directive. This
-implementation may still undergo severe changes or eventually be deprecated.
-
-- numpydoc.only_directives: (DEPRECATED)
-
-- numpydoc.autosummary: (DEPRECATED) An autosummary:: directive. Available in
-Sphinx 0.6.2 and (to-be) 1.0 as sphinx.ext.autosummary, and it the Sphinx 1.0
-version is recommended over that included in Numpydoc.
-
 
 %prep
 %setup -q -n %{modname}-%{version}
-%patch1 -p0
+%patch0 -p1
 
 %build
 # make the documentation
 cd doc 
 make dist PYVER=%{py_ver}
 
-# make numpydoc
-cd sphinxext
-python setup.py build
-
 %install
 # install the documentation
 cd doc
@@ -158,10 +123,6 @@ mv %{buildroot}%{_docdir}/python-%{modname}/html/*.pdf %{buildroot}%{_docdir}/py
 %fdupes %{buildroot}%{_docdir}/python-%{modname}/html/
 %fdupes %{buildroot}%{_docdir}/python-%{modname}/pdf/
 
-# install numpydoc
-cd sphinxext
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-
 %files html
 %defattr(-,root,root)
 %{_docdir}/python-%{modname}/html/
@@ -170,9 +131,4 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 %defattr(-,root,root)
 %{_docdir}/python-%{modname}/pdf/
 
-%files -n python-numpydoc
-%defattr(-,root,root)
-%{python_sitelib}/%{docname}/
-%{python_sitelib}/%{docname}-%{docvers}-py%{py_ver}.egg-info
-
 %changelog

python-numpy.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Oct 31 10:17:25 UTC 2013 - toddrme2178@gmail.com
+
+- Update to 1.8.0
+  Highlights:
+  * New, no 2to3, Python 2 and Python 3 are supported by a common code base. 
+  * New, gufuncs for linear algebra, enabling operations on stacked arrays. 
+  * New, inplace fancy indexing for ufuncs with the ``.at`` method. 
+  * New, ``partition`` function, partial sorting via selection for fast median. 
+  * New, ``nanmean``, ``nanvar``, and ``nanstd`` functions skipping NaNs. 
+  * New, ``full`` and ``full_like`` functions to create value initialized arrays. 
+  * New, ``PyUFunc_RegisterLoopForDescr``, better ufunc support for user dtypes. 
+  * Numerous performance improvements in many areas.
+- Add a new flag to easily enable/disable atlas support for if it
+  ever gets fixed in the future
+- Rebase numpy-buildfix.patch
+
 -------------------------------------------------------------------
 Fri May  3 22:27:24 UTC 2013 - toddrme2178@gmail.com
 

python-numpy.spec

@@ -16,29 +16,30 @@
 #
 
 
+%define with_atlas 0
+
 %define modname numpy
 Name:           python-%{modname}
-Version:        1.7.1
+Version:        1.8.0
 Release:        0
 Url:            http://sourceforge.net/projects/numpy
 Summary:        NumPy array processing for numbers, strings, records and objects
 License:        BSD-3-Clause
 Group:          Development/Libraries/Python
 Source:         http://sourceforge.net/projects/numpy/files/NumPy/%{version}/%{modname}-%{version}.tar.gz
-Patch1:         numpy-buildfix.patch
+Patch0:         numpy-buildfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  blas-devel
 BuildRequires:  lapack-devel
-BuildRequires:  python-devel
+BuildRequires:  python-devel >= 2.6
 Requires:       python >= %{py_ver}
 Provides:       numpy = %{version}
+%if %{with_atlas} == 1
+BuildRequires:  libatlas3-devel
+%endif
 %if 0%{?suse_version}
 BuildRequires:  fdupes
 BuildRequires:  gcc-fortran
-# FIXME: atlas is horribly broken
-# %if 0%{?suse_version} <= 1210
-# BuildRequires:  libatlas3-devel
-# %endif
 %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
@@ -70,21 +71,25 @@ Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
 Requires:       blas-devel
 Requires:       lapack-devel
-Requires:       python-devel
+Requires:       python-devel >= %{py_ver}
 %if 0%{?suse_version}
 Requires:       gcc-fortran
 %py_requires -d
 %else
 Requires:       gcc-gfortran
 %endif
+%if %{with_atlas} == 1
+Requires:       libatlas3-devel
+%endif
 
 %description devel
 This package contains files for developing applications using %{modname}.
 
 %prep
 %setup -q -n %{modname}-%{version}
-%patch1 -p0
+%patch0 -p1
-sed -i "1d" %{modname}/{compat/setup{,scons},distutils/{conv_template,cpuinfo,exec_command,from_template,setup,setupscons,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,setupscons,use_rules},ma/setup{,scons},matrixlib/setup{,scons},setup,setupscons,testing/print_coercion_tables,testing/setup{,scons}}.py # Fix non-executable scripts
+# Fix non-executable scripts
+sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,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