Merge branch 'numpy-1.10' into mpl-1.5.0

sagemath · Nov 10, 2015 · 52a45f4 · 52a45f4
2 parents 7ce23d0 + c7ac0a7
commit 52a45f4
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/build/pkgs/numpy/patches/numpy-1.10.1-asarray_conversion.patch b/build/pkgs/numpy/patches/numpy-1.10.1-asarray_conversion.patch
@@ -1,15 +1,23 @@
 diff -Naur numpy-1.10.1.orig/numpy/core/function_base.py numpy-1.10.1/numpy/core/function_base.py
---- numpy-1.10.1.orig/numpy/core/function_base.py	2015-11-09 10:40:25.078701111 +1300
-+++ numpy-1.10.1/numpy/core/function_base.py	2015-11-09 10:41:36.858716491 +1300
-@@ -87,8 +87,9 @@
+--- numpy-1.10.1.orig/numpy/core/function_base.py	2015-11-11 10:12:45.583322683 +1300
++++ numpy-1.10.1/numpy/core/function_base.py	2015-11-11 10:14:05.813343880 +1300
+@@ -3,7 +3,7 @@
+ __all__ = ['logspace', 'linspace']
+
+ from . import numeric as _nx
+-from .numeric import result_type, NaN
++from .numeric import result_type, NaN, asanyarray
+
+
+ def linspace(start, stop, num=50, endpoint=True, retstep=False, dtype=None):
+@@ -87,8 +87,8 @@
      div = (num - 1) if endpoint else num
 
      # Convert float/complex array scalars to float, gh-3504
 -    start = start * 1.
 -    stop = stop * 1.
-+    from numpy import asarray
-+    start = asarray(start) * 1.
-+    stop = asarray(stop) * 1.
++    start = asanyarray(start) * 1.
++    stop = asanyarray(stop) * 1.
 
      dt = result_type(start, stop, float(num))
      if dtype is None: