[Python-modules-commits] r23912 - in packages/pywavelets/trunk/debian (5 files)

Thu Apr 11 01:47:25 UTC 2013

Date: Thursday, April 11, 2013 @ 01:47:24
  Author: eriol-guest
Revision: 23912

* Removed upstream patches since they are included:
  - 01_fix-cython-0-14-compiling.patch
  - 02_format-float-array-in-doctests.patch
  - 03_fix-help.patch

Modified:
  packages/pywavelets/trunk/debian/changelog
  packages/pywavelets/trunk/debian/patches/series
Deleted:
  packages/pywavelets/trunk/debian/patches/01_fix-cython-0-14-compiling.patch
  packages/pywavelets/trunk/debian/patches/02_format-float-array-in-doctests.patch
  packages/pywavelets/trunk/debian/patches/03_fix-help.patch

Modified: packages/pywavelets/trunk/debian/changelog
===================================================================

--- packages/pywavelets/trunk/debian/changelog	2013-04-11 01:31:45 UTC (rev 23911)
+++ packages/pywavelets/trunk/debian/changelog	2013-04-11 01:47:24 UTC (rev 23912)
@@ -1,6 +1,13 @@
 pywavelets (0.2.2-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Removed upstream patches since they are included:
+    - 01_fix-cython-0-14-compiling.patch
+    - 02_format-float-array-in-doctests.patch
+    - 03_fix-help.patch
+  * debian/watch
+    - Updated to reflect extension change made by upstream
+    - Removed debian uupdate action
 
  -- Daniele Tricoli <eriol at mornie.org>  Thu, 11 Apr 2013 03:06:42 +0200
 

Deleted: packages/pywavelets/trunk/debian/patches/01_fix-cython-0-14-compiling.patch
===================================================================
--- packages/pywavelets/trunk/debian/patches/01_fix-cython-0-14-compiling.patch	2013-04-11 01:31:45 UTC (rev 23911)
+++ packages/pywavelets/trunk/debian/patches/01_fix-cython-0-14-compiling.patch	2013-04-11 01:47:24 UTC (rev 23912)
@@ -1,14 +0,0 @@
-Origin: upstream, https://bitbucket.org/nigma/pywt/changeset/784802d4118c
-Description: Fixed compilation with cython >= 0.14
-
---- a/src/_pywt.pyx
-+++ b/src/_pywt.pyx
-@@ -164,7 +164,7 @@
- 
-     #cdef readonly properties
- 
--    def __new__(self, char* name="", object filter_bank=None):
-+    def __cinit__(self, char* name="", object filter_bank=None):
-         cdef object family_code, family_number
-         cdef object filters
-         cdef int filter_length

Deleted: packages/pywavelets/trunk/debian/patches/02_format-float-array-in-doctests.patch
===================================================================
--- packages/pywavelets/trunk/debian/patches/02_format-float-array-in-doctests.patch	2013-04-11 01:31:45 UTC (rev 23911)
+++ packages/pywavelets/trunk/debian/patches/02_format-float-array-in-doctests.patch	2013-04-11 01:47:24 UTC (rev 23912)
@@ -1,60 +0,0 @@
-Origin: upstream, https://bitbucket.org/nigma/pywt/changeset/75bee65cd484
-Description: Format float arrays in doctests to fix representation issues
- accross Python versions.
-Last-Update: 2012-05-22
-
---- a/doc/source/ref/wavelets.rst
-+++ b/doc/source/ref/wavelets.rst
-@@ -174,6 +174,9 @@
-
-   .. sourcecode:: python
-
-+    >>> def format_array(arr):
-+    ...     return "[%s]" % ", ".join(["%.14f" % x for x in arr])
-+
-     >>> import pywt
-     >>> wavelet = pywt.Wavelet('db1')
-     >>> print wavelet
-@@ -184,10 +187,10 @@
-       Orthogonal:     True
-       Biorthogonal:   True
-       Symmetry:       asymmetric
--    >>> print wavelet.dec_lo, wavelet.dec_hi
--    [0.70710678118654757, 0.70710678118654757] [-0.70710678118654757, 0.70710678118654757]
--    >>> print wavelet.rec_lo, wavelet.rec_hi
--    [0.70710678118654757, 0.70710678118654757] [0.70710678118654757, -0.70710678118654757]
-+    >>> print format_array(wavelet.dec_lo), format_array(wavelet.dec_hi)
-+    [0.70710678118655, 0.70710678118655] [-0.70710678118655, 0.70710678118655]
-+    >>> print format_array(wavelet.rec_lo), format_array(wavelet.rec_hi)
-+    [0.70710678118655, 0.70710678118655] [0.70710678118655, -0.70710678118655]
-
-
- Approximating wavelet and scaling functions - ``Wavelet.wavefun()``
---- a/doc/source/regression/wavelet.rst
-+++ b/doc/source/regression/wavelet.rst
-@@ -78,14 +78,17 @@
- corresponds to lowpass and highpass decomposition filters and lowpass and
- highpass reconstruction filters respectively:
-
--    >>> w.dec_lo
--    [0.035226291882100656, -0.085441273882241486, -0.13501102001039084, 0.45987750211933132, 0.80689150931333875, 0.33267055295095688]
--    >>> w.dec_hi
--    [-0.33267055295095688, 0.80689150931333875, -0.45987750211933132, -0.13501102001039084, 0.085441273882241486, 0.035226291882100656]
--    >>> w.rec_lo
--    [0.33267055295095688, 0.80689150931333875, 0.45987750211933132, -0.13501102001039084, -0.085441273882241486, 0.035226291882100656]
--    >>> w.rec_hi
--    [0.035226291882100656, 0.085441273882241486, -0.13501102001039084, -0.45987750211933132, 0.80689150931333875, -0.33267055295095688]
-+    >>> def print_array(arr):
-+    ...     print "[%s]" % ", ".join(["%.14f" % x for x in arr])
-+
-+    >>> print_array(w.dec_lo)
-+    [0.03522629188210, -0.08544127388224, -0.13501102001039, 0.45987750211933, 0.80689150931334, 0.33267055295096]
-+    >>> print_array(w.dec_hi)
-+    [-0.33267055295096, 0.80689150931334, -0.45987750211933, -0.13501102001039, 0.08544127388224, 0.03522629188210]
-+    >>> print_array(w.rec_lo)
-+    [0.33267055295096, 0.80689150931334, 0.45987750211933, -0.13501102001039, -0.08544127388224, 0.03522629188210]
-+    >>> print_array(w.rec_hi)
-+    [0.03522629188210, 0.08544127388224, -0.13501102001039, -0.45987750211933, 0.80689150931334, -0.33267055295096]
-
- Another way to get the filters data is to use the :attr:`~Wavelet.filter_bank`
- attribute, which returns all four filters in a tuple:

Deleted: packages/pywavelets/trunk/debian/patches/03_fix-help.patch
===================================================================
--- packages/pywavelets/trunk/debian/patches/03_fix-help.patch	2013-04-11 01:31:45 UTC (rev 23911)
+++ packages/pywavelets/trunk/debian/patches/03_fix-help.patch	2013-04-11 01:47:24 UTC (rev 23912)
@@ -1,40 +0,0 @@
-Origin: upstream, https://bitbucket.org/nigma/pywt/changeset/4ff3f22025c9
-Description: Replaced MustOverride hack for BaseNode attributes with plain old
- comment.
-Bug: https://bitbucket.org/nigma/pywt/issue/2/help-broken
-Bug-Debian: http://bugs.debian.org/595980
-Last-Update: 2012-05-22
-
---- a/pywt/wavelet_packets.py
-+++ b/pywt/wavelet_packets.py
-@@ -22,14 +22,15 @@
-     return graycode_order
-
-
--class MustOverride(object):
--    def __init__(self, message): self.message= message
--    def __get__(self, obj, cls): raise NotImplementedError(self.message % {'cls': cls.__name__})
--
--
- class BaseNode(object):
--    PART_LEN = MustOverride("BaseNode.PART_LEN must be redefined in subclass %(cls)s.")
--    PARTS = MustOverride("BaseNode.PARTS must be redefined in subclass %(cls)s.")
-+    """
-+    BaseNode for wavelet packet 1D and 2D tree nodes.
-+    """
-+
-+    # PART_LEN and PARTS attributes that define path tokens for
-+    # node[] lookup must be defined in subclasses.
-+    PART_LEN = None
-+    PARTS = None
-
-     def __init__(self, parent, data, node_name):
-         self.parent = parent
-@@ -341,6 +342,7 @@
- class Node2D(BaseNode):
-     """
-     WaveletPacket tree node.
-+
-     Subnodes are called 'a' (LL), 'h' (LH), 'v' (HL) and  'd' (HH), like approximation and
-     detail coefficients in 2D Discrete Wavelet Transform
-     """

Modified: packages/pywavelets/trunk/debian/patches/series
===================================================================
--- packages/pywavelets/trunk/debian/patches/series	2013-04-11 01:31:45 UTC (rev 23911)
+++ packages/pywavelets/trunk/debian/patches/series	2013-04-11 01:47:24 UTC (rev 23912)
@@ -1,3 +1 @@
-01_fix-cython-0-14-compiling.patch
-02_format-float-array-in-doctests.patch
-03_fix-help.patch
+


