[Python-modules-commits] r28240 - in packages/numpy/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Tuesday, March 18, 2014 @ 18:54:54
  Author: jtaylor-guest
Revision: 28240

quantities-linspace.patch: avoid breaking python-quantities

Added:
  packages/numpy/trunk/debian/patches/quantities-linspace.patch
Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/series

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2014-03-18 17:55:12 UTC (rev 28239)
+++ packages/numpy/trunk/debian/changelog	2014-03-18 18:54:54 UTC (rev 28240)
@@ -1,6 +1,7 @@
 python-numpy (1:1.8.1~rc1-2) unstable; urgency=medium
 
   * fix -arch build by only calling dh_sphinxdoc in -indep
+  * quantities-linspace.patch: avoid breaking python-quantities
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 13 Mar 2014 18:40:56 +0100
 

Added: packages/numpy/trunk/debian/patches/quantities-linspace.patch
===================================================================
--- packages/numpy/trunk/debian/patches/quantities-linspace.patch	                        (rev 0)
+++ packages/numpy/trunk/debian/patches/quantities-linspace.patch	2014-03-18 18:54:54 UTC (rev 28240)
@@ -0,0 +1,18 @@
+Description: Fix linspace for use with physical quantities
+ The fix for issue 3504 led to errors when using linspace with the quantities package.
+Origin: ffc0d2c498cb990ca07fe18f3a5b57bb9af48636
+Bug: https://github.com/numpy/numpy/pull/4503
+Applied-Upstream: 1.8.1
+--- a/numpy/core/function_base.py
++++ b/numpy/core/function_base.py
+@@ -76,8 +76,8 @@ def linspace(start, stop, num=50, endpoint=True, retstep=False):
+     num = int(num)
+ 
+     # Convert float/complex array scalars to float, gh-3504 
+-    start = start + 0.
+-    stop = stop + 0.
++    start = start * 1.
++    stop = stop * 1.
+ 
+     if num <= 0:
+         return array([], float)

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2014-03-18 17:55:12 UTC (rev 28239)
+++ packages/numpy/trunk/debian/patches/series	2014-03-18 18:54:54 UTC (rev 28240)
@@ -5,3 +5,4 @@
 10_use_local_python.org_object.inv_sphinx.diff
 python3-soabi.patch
 restore-3kcompat-api.patch
+quantities-linspace.patch