Accepting request 451739 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/451739
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=52
This commit is contained in:
Dominique Leuenberger 2017-01-25 21:34:53 +00:00 committed by Git OBS Bridge
parent b8838938c2
commit 61d47c6163
7 changed files with 194 additions and 89 deletions

View File

@ -1,39 +0,0 @@
diff -Npru numpy-1.10.4.orig/numpy/distutils/system_info.py numpy-1.10.4/numpy/distutils/system_info.py
--- numpy-1.10.4.orig/numpy/distutils/system_info.py 2016-03-29 17:35:18.195045099 -0400
+++ numpy-1.10.4/numpy/distutils/system_info.py 2016-03-30 15:14:40.981853527 -0400
@@ -1688,9 +1688,10 @@ class blas_info(system_info):
info['language'] = 'f77' # XXX: is it generally true?
else:
lib = self.has_cblas(info)
+ # In openSUSE, both libblas.so and libcblas.so are needed.
if lib is not None:
info['language'] = 'c'
- info['libraries'] = [lib]
+ info['libraries'] = [lib,'blas']
info['define_macros'] = [('HAVE_CBLAS', None)]
self.set_info(**info)
@@ -1720,18 +1721,19 @@ class blas_info(system_info):
# check we can link (find library)
# some systems have separate cblas and blas libs. First
# check for cblas lib, and if not present check for blas lib.
+ # In openSUSE, libcblas.so dose not contain symbols in libblas.so
try:
c.link_executable(obj, os.path.join(tmpdir, "a.out"),
- libraries=["cblas"],
+ libraries=["blas"],
library_dirs=info['library_dirs'],
extra_postargs=info.get('extra_link_args', []))
- res = "cblas"
+ res = "blas"
except distutils.ccompiler.LinkError:
c.link_executable(obj, os.path.join(tmpdir, "a.out"),
- libraries=["blas"],
+ libraries=["cblas","blas"],
library_dirs=info['library_dirs'],
extra_postargs=info.get('extra_link_args', []))
- res = "blas"
+ res = "cblas"
except distutils.ccompiler.CompileError:
res = None
finally:

View File

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

3
numpy-1.12.0.zip Normal file
View File

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

View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Sat Jan 21 15:07:23 UTC 2017 - toddrme2178@gmail.com
- Fix dependencies
-------------------------------------------------------------------
Wed Jan 18 15:40:12 UTC 2017 - toddrme2178@gmail.com
- Fix version number
-------------------------------------------------------------------
Tue Jan 17 17:24:28 UTC 2017 - toddrme2178@gmail.com
- update to version 1.12.0:
* Highlights
+ Order of operations in np.einsum can now be optimized for large
speed improvements.
+ New signature argument to np.vectorize for vectorizing with core
dimensions.
+ The keepdims argument was added to many functions.
+ New context manager for testing warnings
+ Support for BLIS in numpy.distutils
+ Much improved support for PyPy (not yet finished)
* full changelog at:
https://github.com/numpy/numpy/blob/master/doc/release/1.12.0-notes.rst
- changes from version 1.11.3:
* #8341: BUG: Fix ndarray.tofile large file corruption in append
mode.
* #8346: TST: Fix tests in PR #8341 for NumPy 1.11.x
- update to version 1.11.2:
* #7736 BUG: Many functions silently drop 'keepdims' kwarg.
* #7738 ENH: Add extra kwargs and update doc of many MA methods.
* #7778 DOC: Update Numpy 1.11.1 release notes.
* #7793 BUG: MaskedArray.count treats negative axes incorrectly.
* #7816 BUG: Fix array too big error for wide dtypes.
* #7821 BUG: Make sure npy_mul_with_overflow_<type> detects
overflow.
* #7824 MAINT: Allocate fewer bytes for empty arrays.
* #7847 MAINT,DOC: Fix some imp module uses and update f2py.compile
docstring.
* #7849 MAINT: Fix remaining uses of deprecated Python imp module.
* #7851 BLD: Fix ATLAS version detection.
* #7896 BUG: Construct ma.array from np.array which contains
padding.
* #7904 BUG: Fix float16 type not being called due to wrong
ordering.
* #7917 BUG: Production install of numpy should not require nose.
* #7919 BLD: Fixed MKL detection for recent versions of this
library.
* #7920 BUG: Fix for issue #7835 (ma.median of 1d).
* #7932 BUG: Monkey-patch _msvccompile.gen_lib_option like other
compilers.
* #7939 BUG: Check for HAVE_LDOUBLE_DOUBLE_DOUBLE_LE in
npy_math_complex.
* #7953 BUG: Guard against buggy comparisons in generic quicksort.
* #7954 BUG: Use keyword arguments to initialize Extension base
class.
* #7955 BUG: Make sure numpy globals keep identity after reload.
* #7972 BUG: MSVCCompiler grows 'lib' & 'include' env strings
exponentially.
* #8005 BLD: Remove __NUMPY_SETUP__ from builtins at end of
setup.py.
* #8010 MAINT: Remove leftover imp module imports.
* #8020 BUG: Fix return of np.ma.count if keepdims is True and axis
is None.
* #8024 BUG: Fix numpy.ma.median.
* #8031 BUG: Fix np.ma.median with only one non-masked value.
* #8044 BUG: Fix bug in NpyIter buffering with discontinuous arrays.
- update copyright year
- changed from tar.gz to zip on pypi
- Remove long-unused atlas support.
- Use preferrered pypi.io download url.
- Add openBLAS support.
This can improve performance in many situations.
- Remove numpy-1.10.4-cblas.patch since openblas handles this.
-------------------------------------------------------------------
Mon Apr 4 16:15:27 UTC 2016 - toddrme2178@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-numpy-doc
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,19 +32,17 @@ BuildRequires: gcc-fortran
BuildRequires: gcc-gfortran
%endif
Name: python-numpy-doc
Version: 1.11.1
Version: 1.12.0
Release: 0
Summary: Documentation for python-numpy
License: BSD-3-Clause
Group: Development/Libraries/Python
Url: http://www.numpy.org/
Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.tar.gz
Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.zip
# 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
BuildRequires: blas-devel
BuildRequires: lapack-devel
BuildRequires: python-Sphinx
@ -54,6 +52,7 @@ BuildRequires: python-numpy-devel = %{version}
BuildRequires: python-numpydoc
BuildRequires: python-setuptools
BuildRequires: zip
BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
BuildRequires: cblas-devel
@ -127,9 +126,6 @@ This package provides the PDF documentation for NumPy
%setup -q -n numpy-%{version}
%patch0 -p1
%patch1 -p1
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
%patch2 -p1
%endif
# drop build date from doc to fix build-compare
sed -i "s/\(html_last_updated_fmt = \).*/\\1None/" doc/source/conf.py

View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Tue Jan 17 17:24:28 UTC 2017 - toddrme2178@gmail.com
- update to version 1.12.0:
* Highlights
+ Order of operations in np.einsum can now be optimized for large
speed improvements.
+ New signature argument to np.vectorize for vectorizing with core
dimensions.
+ The keepdims argument was added to many functions.
+ New context manager for testing warnings
+ Support for BLIS in numpy.distutils
+ Much improved support for PyPy (not yet finished)
* full changelog at:
https://github.com/numpy/numpy/blob/master/doc/release/1.12.0-notes.rst
- changes from version 1.11.3:
* #8341: BUG: Fix ndarray.tofile large file corruption in append
mode.
* #8346: TST: Fix tests in PR #8341 for NumPy 1.11.x
- update to version 1.11.2:
* #7736 BUG: Many functions silently drop 'keepdims' kwarg.
* #7738 ENH: Add extra kwargs and update doc of many MA methods.
* #7778 DOC: Update Numpy 1.11.1 release notes.
* #7793 BUG: MaskedArray.count treats negative axes incorrectly.
* #7816 BUG: Fix array too big error for wide dtypes.
* #7821 BUG: Make sure npy_mul_with_overflow_<type> detects
overflow.
* #7824 MAINT: Allocate fewer bytes for empty arrays.
* #7847 MAINT,DOC: Fix some imp module uses and update f2py.compile
docstring.
* #7849 MAINT: Fix remaining uses of deprecated Python imp module.
* #7851 BLD: Fix ATLAS version detection.
* #7896 BUG: Construct ma.array from np.array which contains
padding.
* #7904 BUG: Fix float16 type not being called due to wrong
ordering.
* #7917 BUG: Production install of numpy should not require nose.
* #7919 BLD: Fixed MKL detection for recent versions of this
library.
* #7920 BUG: Fix for issue #7835 (ma.median of 1d).
* #7932 BUG: Monkey-patch _msvccompile.gen_lib_option like other
compilers.
* #7939 BUG: Check for HAVE_LDOUBLE_DOUBLE_DOUBLE_LE in
npy_math_complex.
* #7953 BUG: Guard against buggy comparisons in generic quicksort.
* #7954 BUG: Use keyword arguments to initialize Extension base
class.
* #7955 BUG: Make sure numpy globals keep identity after reload.
* #7972 BUG: MSVCCompiler grows 'lib' & 'include' env strings
exponentially.
* #8005 BLD: Remove __NUMPY_SETUP__ from builtins at end of
setup.py.
* #8010 MAINT: Remove leftover imp module imports.
* #8020 BUG: Fix return of np.ma.count if keepdims is True and axis
is None.
* #8024 BUG: Fix numpy.ma.median.
* #8031 BUG: Fix np.ma.median with only one non-masked value.
* #8044 BUG: Fix bug in NpyIter buffering with discontinuous arrays.
- update copyright year
- changed from tar.gz to zip on pypi
- Remove long-unused atlas support.
- Use preferrered pypi.io download url.
- Add openBLAS support.
This can improve performance in many situations.
- Remove numpy-1.10.4-cblas.patch since openblas handles this.
-------------------------------------------------------------------
Tue Nov 22 15:56:51 UTC 2016 - toddrme2178@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-numpy
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,50 +15,63 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if 0%{?is_opensuse} == 0
%bcond_with openblas
%else
%ifarch armv6l
%bcond_with openblas
%ifarch s390x
%bcond_with openblas
%else
%else
%if 0%{?sle_version} == 120200
%ifarch i586
%bcond_with openblas
%else
%bcond_without openblas
%endif
%else
%bcond_without openblas
%endif
%endif
%endif
%endif
%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.1
Version: 1.12.0
Release: 0
Summary: NumPy array processing for numbers, strings, records and objects
License: BSD-3-Clause
Group: Development/Libraries/Python
Url: http://www.numpy.org/
Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.tar.gz
Source: https://pypi.io/packages/source/n/numpy/numpy-%{version}.zip
# 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
BuildRequires: blas-devel
BuildRequires: lapack-devel
BuildRequires: unzip
%if %{with openblas}
BuildRequires: openblas-devel
%endif
BuildRequires: python-devel >= 2.6
BuildRequires: python-setuptools
Requires: python >= %{py_ver}
%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
%if 0%{?is_opensuse} && ( 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 )
BuildRequires: cblas-devel
%endif
%if %{with_atlas} == 1
BuildRequires: libatlas3-devel
%endif
%description
NumPy is a general-purpose array-processing package designed to
@ -79,18 +92,14 @@ 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
%py_requires -d
%else
Requires: gcc-gfortran
%endif
%if %{with_atlas} == 1
Requires: libatlas3-devel
%endif
%if 0%{?is_opensuse} && ( 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 )
Requires: cblas-devel
%endif
%description devel
This package contains files for developing applications using numpy.
@ -99,9 +108,6 @@ This package contains files for developing applications using numpy.
%setup -q -n numpy-%{version}
%patch0 -p1
%patch1 -p1
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
%patch2 -p1
%endif
# 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