[Python-modules-commits] r25775 - in packages/scipy/trunk/debian (8 files)

jtaylor-guest at users.alioth.debian.org jtaylor-guest at users.alioth.debian.org
Sat Sep 7 19:57:24 UTC 2013 

    Date: Saturday, September 7, 2013 @ 19:57:22
  Author: jtaylor-guest
Revision: 25775

New upstream beta release

Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/patches/cap-ld-precision.patch
  packages/scipy/trunk/debian/patches/qhull-lfs.patch
  packages/scipy/trunk/debian/patches/restore_sys_argv.patch
  packages/scipy/trunk/debian/patches/reswig.patch
  packages/scipy/trunk/debian/patches/series
Deleted:
  packages/scipy/trunk/debian/patches/add-swig-filetypes.patch
  packages/scipy/trunk/debian/patches/cython-wraparound.patch

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2013-09-07 10:50:02 UTC (rev 25774)
+++ packages/scipy/trunk/debian/changelog	2013-09-07 19:57:22 UTC (rev 25775)
@@ -1,9 +1,10 @@
-python-scipy (0.12.0-3) UNRELEASED; urgency=low
+python-scipy (0.13.0~b1-1) experimental; urgency=low
 
+  * New upstream beta release
   * require python-six >= 1.3.0, scipy ships a slightly patched 1.2.0,
     version 1.3.0 includes the patches
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 08 Aug 2013 20:40:29 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 07 Sep 2013 18:06:00 +0200
 
 python-scipy (0.12.0-2) unstable; urgency=low
 

Deleted: packages/scipy/trunk/debian/patches/add-swig-filetypes.patch
===================================================================
--- packages/scipy/trunk/debian/patches/add-swig-filetypes.patch	2013-09-07 10:50:02 UTC (rev 25774)
+++ packages/scipy/trunk/debian/patches/add-swig-filetypes.patch	2013-09-07 19:57:22 UTC (rev 25775)
@@ -1,66 +0,0 @@
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-Description: add swig file type headers
- The swig files use C++ features so they should be declared as C++.
- This allows reswigging with setup.py.
-Origin: 6bcb152642ab966b2e3959159ba9a6dc986b1210
-Applied-Upstream: 0.13
-
---- a/scipy/sparse/sparsetools/bsr.i
-+++ b/scipy/sparse/sparsetools/bsr.i
-@@ -1,3 +1,4 @@
-+/* -*- C++ -*- */
- %module bsr
- 
- %include "sparsetools.i"
---- a/scipy/sparse/sparsetools/coo.i
-+++ b/scipy/sparse/sparsetools/coo.i
-@@ -1,3 +1,4 @@
-+/* -*- C++ -*- */
- %module coo
- 
- %include "sparsetools.i"
---- a/scipy/sparse/sparsetools/csc.i
-+++ b/scipy/sparse/sparsetools/csc.i
-@@ -1,3 +1,4 @@
-+/* -*- C++ -*- */
- %module csc
- 
- %include "sparsetools.i"
---- a/scipy/sparse/sparsetools/csgraph.i
-+++ b/scipy/sparse/sparsetools/csgraph.i
-@@ -1,4 +1,4 @@
--/* -*- C -*- */
-+/* -*- C++ -*- */
- %module csgraph
- 
- %include "sparsetools.i"
---- a/scipy/sparse/sparsetools/csr.i
-+++ b/scipy/sparse/sparsetools/csr.i
-@@ -1,3 +1,4 @@
-+/* -*- C++ -*- */
- %module csr
- 
- %include "sparsetools.i"
---- a/scipy/sparse/sparsetools/dia.i
-+++ b/scipy/sparse/sparsetools/dia.i
-@@ -1,3 +1,4 @@
-+/* -*- C++ -*- */
- %module dia
- 
- %include "sparsetools.i"
---- a/scipy/sparse/sparsetools/numpy.i
-+++ b/scipy/sparse/sparsetools/numpy.i
-@@ -1,4 +1,4 @@
--/* -*- C -*-  (not really, but good for syntax highlighting) */
-+/* -*- C -*- */
- %{
- #ifndef SWIG_FILE_WITH_INIT
- #  define NO_IMPORT_ARRAY
---- a/scipy/sparse/sparsetools/sparsetools.i
-+++ b/scipy/sparse/sparsetools/sparsetools.i
-@@ -1,4 +1,4 @@
--/* -*- C -*-  (not really, but good for syntax highlighting) */
-+/* -*- C++ -*- */
- /*%module sparsetools*/
- 
-  /* why does SWIG complain about int arrays? a typecheck is provided */

Modified: packages/scipy/trunk/debian/patches/cap-ld-precision.patch
===================================================================
--- packages/scipy/trunk/debian/patches/cap-ld-precision.patch	2013-09-07 10:50:02 UTC (rev 25774)
+++ packages/scipy/trunk/debian/patches/cap-ld-precision.patch	2013-09-07 19:57:22 UTC (rev 25775)
@@ -5,7 +5,7 @@
 
 --- a/scipy/signal/tests/test_signaltools.py
 +++ b/scipy/signal/tests/test_signaltools.py
-@@ -609,7 +609,15 @@ class TestCorrelate2d(TestCase):
+@@ -622,7 +622,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)
@@ -24,7 +24,7 @@
  
 --- a/scipy/linalg/tests/test_basic.py
 +++ b/scipy/linalg/tests/test_basic.py
-@@ -674,13 +674,23 @@ class TestNorm(object):
+@@ -685,13 +685,23 @@ class TestNorm(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/cython-wraparound.patch
===================================================================
--- packages/scipy/trunk/debian/patches/cython-wraparound.patch	2013-09-07 10:50:02 UTC (rev 25774)
+++ packages/scipy/trunk/debian/patches/cython-wraparound.patch	2013-09-07 19:57:22 UTC (rev 25775)
@@ -1,22 +0,0 @@
-Description: drop wrong cython.wraparound(False)
-Bug: https://github.com/scipy/scipy/issues/2427
-Origin: https://github.com/scipy/scipy/pull/2435
-
---- a/scipy/spatial/ckdtree.pyx
-+++ b/scipy/spatial/ckdtree.pyx
-@@ -1164,7 +1164,6 @@ cdef class cKDTree:
- 
- 
-     @cython.boundscheck(False)
--    @cython.wraparound(False)
-     def query(cKDTree self, object x, np.intp_t k=1, np.float64_t eps=0,
-               np.float64_t p=2, np.float64_t distance_upper_bound=infinity):
-         """query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)
-@@ -1864,7 +1863,6 @@ cdef class cKDTree:
-         return 0
- 
-     @cython.boundscheck(False)
--    @cython.wraparound(False)
-     def count_neighbors(cKDTree self, cKDTree other, object r, np.float64_t p=2.):
-         """count_neighbors(self, other, r, p)
- 

Modified: packages/scipy/trunk/debian/patches/qhull-lfs.patch
===================================================================
--- packages/scipy/trunk/debian/patches/qhull-lfs.patch	2013-09-07 10:50:02 UTC (rev 25774)
+++ packages/scipy/trunk/debian/patches/qhull-lfs.patch	2013-09-07 19:57:22 UTC (rev 25775)
@@ -5,7 +5,7 @@
 
 --- a/scipy/spatial/setup.py
 +++ b/scipy/spatial/setup.py
-@@ -28,6 +28,9 @@ def configuration(parent_package = '', t
+@@ -29,6 +29,9 @@ def configuration(parent_package='', top
      cfg = dict(get_info('lapack_opt'))
      cfg.setdefault('include_dirs', []).extend(inc_dirs)
      cfg.setdefault('define_macros', []).append(('qh_QHpointer','1'))

Modified: packages/scipy/trunk/debian/patches/restore_sys_argv.patch
===================================================================
--- packages/scipy/trunk/debian/patches/restore_sys_argv.patch	2013-09-07 10:50:02 UTC (rev 25774)
+++ packages/scipy/trunk/debian/patches/restore_sys_argv.patch	2013-09-07 19:57:22 UTC (rev 25775)
@@ -3,9 +3,9 @@
 
 --- a/scipy/weave/build_tools.py
 +++ b/scipy/weave/build_tools.py
-@@ -284,6 +284,9 @@ def build_extension(module_path,compiler
+@@ -292,6 +292,9 @@ def build_extension(module_path,compiler
          configure_python_path(build_dir)
-     except SyntaxError: #TypeError:
+     except SyntaxError:  # TypeError:
          success = 0
 +    except Exception, e:
 +        restore_sys_argv()

Modified: packages/scipy/trunk/debian/patches/reswig.patch
===================================================================
--- packages/scipy/trunk/debian/patches/reswig.patch	2013-09-07 10:50:02 UTC (rev 25774)
+++ packages/scipy/trunk/debian/patches/reswig.patch	2013-09-07 19:57:22 UTC (rev 25775)
@@ -5,13 +5,14 @@
 
 --- a/scipy/sparse/sparsetools/setup.py
 +++ b/scipy/sparse/sparsetools/setup.py
-@@ -8,11 +8,11 @@ def configuration(parent_package='',top_
+@@ -9,11 +9,11 @@ def configuration(parent_package='',top_
      config = Configuration('sparsetools',parent_package,top_path)
  
      for fmt in ['csr','csc','coo','bsr','dia','csgraph']:
--        sources = [ fmt + '_wrap.cxx' ]
-+        sources = [ fmt + '.i' ]
-         depends = [ fmt + '.h' ]
+-        sources = [fmt + '_wrap.cxx']
+-        depends = [fmt + '.h']
++        sources = [fmt + '.i' ]
++        depends = [fmt + '.h']
          config.add_extension('_' + fmt, sources=sources,
              define_macros=[('__STDC_FORMAT_MACROS', 1)],
 -            depends=depends)

Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series	2013-09-07 10:50:02 UTC (rev 25774)
+++ packages/scipy/trunk/debian/patches/series	2013-09-07 19:57:22 UTC (rev 25775)
@@ -1,7 +1,5 @@
 restore_sys_argv.patch
 blitz++.patch
-add-swig-filetypes.patch
 reswig.patch
-cython-wraparound.patch
 qhull-lfs.patch
 cap-ld-precision.patch

More information about the Python-modules-commits mailing list