[Python-modules-commits] r33814 - in packages/scipy/trunk/debian (7 files)
varun at users.alioth.debian.org
varun at users.alioth.debian.org
Mon Aug 17 05:30:08 UTC 2015
Date: Monday, August 17, 2015 @ 05:30:07
Author: varun
Revision: 33814
* New upstream release
* Bump Standards-Version to 3.9.6
* Remove upstream applied patches:
- fitpack-alias.patch
- fix-undefined-behavior-in-alngam.patch
- relax-bounds-of-interpolate-test.patch
Modified:
packages/scipy/trunk/debian/changelog
packages/scipy/trunk/debian/control
packages/scipy/trunk/debian/patches/cap-ld-precision.patch
packages/scipy/trunk/debian/patches/series
Deleted:
packages/scipy/trunk/debian/patches/fitpack-alias.patch
packages/scipy/trunk/debian/patches/fix-undefined-behavior-in-alngam.patch
packages/scipy/trunk/debian/patches/relax-bounds-of-interpolate-test.patch
Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog 2015-08-17 04:33:41 UTC (rev 33813)
+++ packages/scipy/trunk/debian/changelog 2015-08-17 05:30:07 UTC (rev 33814)
@@ -1,3 +1,14 @@
+python-scipy (0.16.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Bump Standards-Version to 3.9.6
+ * Remove upstream applied patches:
+ - fitpack-alias.patch
+ - fix-undefined-behavior-in-alngam.patch
+ - relax-bounds-of-interpolate-test.patch
+
+ -- Varun Hiremath <varun at debian.org> Mon, 17 Aug 2015 00:46:43 -0400
+
python-scipy (0.14.1-1) unstable; urgency=medium
* New upstream bugfix release
Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control 2015-08-17 04:33:41 UTC (rev 33813)
+++ packages/scipy/trunk/debian/control 2015-08-17 05:30:07 UTC (rev 33814)
@@ -28,12 +28,13 @@
Build-Depends-Indep: dvipng,
python-docutils,
python-matplotlib,
+ python-numpydoc,
python-sphinx,
texlive-latex-base,
texlive-latex-extra
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.1
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.scipy.org/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/scipy/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/scipy/trunk/
Modified: packages/scipy/trunk/debian/patches/cap-ld-precision.patch
===================================================================
--- packages/scipy/trunk/debian/patches/cap-ld-precision.patch 2015-08-17 04:33:41 UTC (rev 33813)
+++ packages/scipy/trunk/debian/patches/cap-ld-precision.patch 2015-08-17 05:30:07 UTC (rev 33814)
@@ -3,9 +3,11 @@
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702169
---- a/scipy/signal/tests/test_signaltools.py
-+++ b/scipy/signal/tests/test_signaltools.py
-@@ -744,7 +744,15 @@ class TestCorrelate2d(TestCase):
+Index: python-scipy-0.16.0/scipy/signal/tests/test_signaltools.py
+===================================================================
+--- python-scipy-0.16.0.orig/scipy/signal/tests/test_signaltools.py
++++ python-scipy-0.16.0/scipy/signal/tests/test_signaltools.py
+@@ -1039,7 +1039,15 @@ class TestCorrelate2d(TestCase):
# name will be TestCorrelateComplex###, where ### is the number of bits.
for datatype in [np.csingle, np.cdouble, np.clongdouble]:
cls = _get_testcorrelate_class(datatype, _TestCorrelateComplex)
@@ -22,9 +24,11 @@
globals()[cls.__name__] = cls
---- a/scipy/linalg/tests/test_basic.py
-+++ b/scipy/linalg/tests/test_basic.py
-@@ -685,13 +685,23 @@ class TestNorm(object):
+Index: python-scipy-0.16.0/scipy/linalg/tests/test_basic.py
+===================================================================
+--- python-scipy-0.16.0.orig/scipy/linalg/tests/test_basic.py
++++ python-scipy-0.16.0/scipy/linalg/tests/test_basic.py
+@@ -878,13 +878,23 @@ class TestVectorNorms(object):
def test_types(self):
for dtype in np.typecodes['AllFloat']:
x = np.array([1,2,3], dtype=dtype)
Deleted: packages/scipy/trunk/debian/patches/fitpack-alias.patch
===================================================================
--- packages/scipy/trunk/debian/patches/fitpack-alias.patch 2015-08-17 04:33:41 UTC (rev 33813)
+++ packages/scipy/trunk/debian/patches/fitpack-alias.patch 2015-08-17 05:30:07 UTC (rev 33814)
@@ -1,123 +0,0 @@
-Description: avoid passing aliased memory to fortran
-Bug: https://github.com/scipy/scipy/issues/2911
-Origin: https://github.com/scipy/scipy/pull/3673
-
---- a/scipy/interpolate/src/__fitpack.h
-+++ b/scipy/interpolate/src/__fitpack.h
-@@ -798,47 +798,95 @@ fitpack_insert(PyObject *dummy, PyObject
- int iopt, n, nn, k, ier, m, nest;
- npy_intp dims[1];
- double x;
-- double *t, *c, *tt, *cc;
-- PyArrayObject *ap_t = NULL, *ap_c = NULL, *ap_tt = NULL, *ap_cc = NULL;
-+ double *t_in, *c_in, *t_out, *c_out, *t_buf = NULL, *c_buf = NULL, *p;
-+ double *t1, *t2, *c1, *c2;
-+ PyArrayObject *ap_t_in = NULL, *ap_c_in = NULL, *ap_t_out = NULL, *ap_c_out = NULL;
- PyObject *t_py = NULL, *c_py = NULL;
- PyObject *ret = NULL;
-
- if (!PyArg_ParseTuple(args, "iOOidi",&iopt,&t_py,&c_py,&k, &x, &m)) {
- return NULL;
- }
-- ap_t = (PyArrayObject *)PyArray_ContiguousFromObject(t_py, NPY_DOUBLE, 0, 1);
-- ap_c = (PyArrayObject *)PyArray_ContiguousFromObject(c_py, NPY_DOUBLE, 0, 1);
-- if (ap_t == NULL || ap_c == NULL) {
-+ ap_t_in = (PyArrayObject *)PyArray_ContiguousFromObject(t_py, NPY_DOUBLE, 0, 1);
-+ ap_c_in = (PyArrayObject *)PyArray_ContiguousFromObject(c_py, NPY_DOUBLE, 0, 1);
-+ if (ap_t_in == NULL || ap_c_in == NULL) {
- goto fail;
- }
-- t = (double *)ap_t->data;
-- c = (double *)ap_c->data;
-- n = ap_t->dimensions[0];
-+ t_in = (double *)ap_t_in->data;
-+ c_in = (double *)ap_c_in->data;
-+ n = ap_t_in->dimensions[0];
- nest = n + m;
- dims[0] = nest;
-- ap_tt = (PyArrayObject *)PyArray_SimpleNew(1, dims, NPY_DOUBLE);
-- ap_cc = (PyArrayObject *)PyArray_SimpleNew(1, dims, NPY_DOUBLE);
-- if (ap_tt == NULL || ap_cc == NULL) {
-+ ap_t_out = (PyArrayObject *)PyArray_SimpleNew(1, dims, NPY_DOUBLE);
-+ ap_c_out = (PyArrayObject *)PyArray_SimpleNew(1, dims, NPY_DOUBLE);
-+ if (ap_t_out == NULL || ap_c_out == NULL) {
- goto fail;
- }
-- tt = (double *)ap_tt->data;
-- cc = (double *)ap_cc->data;
-+ t_out = (double *)ap_t_out->data;
-+ c_out = (double *)ap_c_out->data;
-+
-+ /*
-+ * Call the INSERT routine m times to insert m-multiplicity knot, ie.:
-+ *
-+ * for _ in range(n, nest):
-+ * t, c = INSERT(t, c)
-+ * return t, c
-+ *
-+ * We need to ensure that input and output buffers given to INSERT routine
-+ * do not point to same memory, which is not allowed by Fortran. For this,
-+ * we use temporary storage, and cycle between it and the output buffers.
-+ */
-+ t2 = t_in;
-+ c2 = c_in;
-+ t1 = t_out;
-+ c1 = c_out;
-+
- for ( ; n < nest; n++) {
-- INSERT(&iopt, t, &n, c, &k, &x, tt, &nn, cc, &nest, &ier);
-+ /* Swap buffers */
-+ p = t2; t2 = t1; t1 = p;
-+ p = c2; c2 = c1; c1 = p;
-+
-+ /* Allocate temporary buffer (needed for m > 1) */
-+ if (t2 == t_in) {
-+ if (t_buf == NULL) {
-+ t_buf = calloc(nest, sizeof(double));
-+ c_buf = calloc(nest, sizeof(double));
-+ if (t_buf == NULL || c_buf == NULL) {
-+ PyErr_NoMemory();
-+ goto fail;
-+ }
-+ }
-+ t2 = t_buf;
-+ c2 = c_buf;
-+ }
-+
-+ INSERT(&iopt, t1, &n, c1, &k, &x, t2, &nn, c2, &nest, &ier);
-+
- if (ier) {
- break;
- }
-- t = tt;
-- c = cc;
- }
-- Py_DECREF(ap_c);
-- Py_DECREF(ap_t);
-- ret = Py_BuildValue("NNi", PyArray_Return(ap_tt), PyArray_Return(ap_cc), ier);
-+
-+ /* Ensure output ends up in output buffers */
-+ if (t2 != t_out) {
-+ memcpy(t_out, t2, nest * sizeof(double));
-+ memcpy(c_out, c2, nest * sizeof(double));
-+ }
-+
-+ Py_DECREF(ap_c_in);
-+ Py_DECREF(ap_t_in);
-+ free(t_buf);
-+ free(c_buf);
-+ ret = Py_BuildValue("NNi", PyArray_Return(ap_t_out), PyArray_Return(ap_c_out), ier);
- return ret;
-
- fail:
-- Py_XDECREF(ap_c);
-- Py_XDECREF(ap_t);
-+ Py_XDECREF(ap_c_out);
-+ Py_XDECREF(ap_t_out);
-+ Py_XDECREF(ap_c_in);
-+ Py_XDECREF(ap_t_in);
-+ free(t_buf);
-+ free(c_buf);
- return NULL;
- }
-
Deleted: packages/scipy/trunk/debian/patches/fix-undefined-behavior-in-alngam.patch
===================================================================
--- packages/scipy/trunk/debian/patches/fix-undefined-behavior-in-alngam.patch 2015-08-17 04:33:41 UTC (rev 33813)
+++ packages/scipy/trunk/debian/patches/fix-undefined-behavior-in-alngam.patch 2015-08-17 05:30:07 UTC (rev 33814)
@@ -1,21 +0,0 @@
-Description: fix undefined behavior in alngam
- INT(A) is undefined if A cannot be represented as INT
- In MIPS the result is positive triggering a huge loop for:
-
- scipy.stats.skellam.sf(np.inf, 10, 11)
-Date: Sun, 24 Aug 2014 15:10:56 +0200
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-Origin: 26f8a09d2ed6d123a8d624dffa5d3a5caf3d351e
-Bug: https://github.com/scipy/scipy/pull/3899
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756905
-
---- a/scipy/special/cdflib/alngam.f
-+++ b/scipy/special/cdflib/alngam.f
-@@ -105,6 +105,7 @@ C
- C IF NECESSARY MAKE X AT LEAST 12 AND CARRY CORRECTION IN OFFSET
- C
- C
-+ IF ((x.GT.12.0D0)) GO TO 90
- n = int(12.0D0-x)
- IF (.NOT. (n.GT.0)) GO TO 90
- prod = 1.0D0
Deleted: packages/scipy/trunk/debian/patches/relax-bounds-of-interpolate-test.patch
===================================================================
--- packages/scipy/trunk/debian/patches/relax-bounds-of-interpolate-test.patch 2015-08-17 04:33:41 UTC (rev 33813)
+++ packages/scipy/trunk/debian/patches/relax-bounds-of-interpolate-test.patch 2015-08-17 05:30:07 UTC (rev 33814)
@@ -1,18 +0,0 @@
-Description: relax bounds of interpolate test
- A small rounding error appears with gcc-4.9 on i586 which causes the a
- root to be -1e-19 instead of 0. and subsequently being cut by the exact
- masking causing a testfailure.
-Bug: https://github.com/scipy/scipy/pull/3907
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-
---- a/scipy/interpolate/tests/test_interpolate.py
-+++ b/scipy/interpolate/tests/test_interpolate.py
-@@ -745,7 +745,7 @@ class TestPPoly(TestCase):
- pp = PPoly.from_spline(spl)
-
- r = pp.roots()
-- r = r[(r >= 0) & (r <= 1)]
-+ r = r[(r >= 0 - 1e-15) & (r <= 1 + 1e-15)]
- assert_allclose(r, sproot(spl), atol=1e-15)
-
- def test_roots_idzero(self):
Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series 2015-08-17 04:33:41 UTC (rev 33813)
+++ packages/scipy/trunk/debian/patches/series 2015-08-17 05:30:07 UTC (rev 33814)
@@ -2,6 +2,3 @@
blitz++.patch
qhull-lfs.patch
cap-ld-precision.patch
-fitpack-alias.patch
-fix-undefined-behavior-in-alngam.patch
-relax-bounds-of-interpolate-test.patch
More information about the Python-modules-commits
mailing list