[Python-modules-commits] r21868 - in packages/pywavelets/trunk/debian (4 files)

eriol-guest at users.alioth.debian.org eriol-guest at users.alioth.debian.org
Tue May 22 04:17:58 UTC 2012 

    Date: Tuesday, May 22, 2012 @ 04:17:55
  Author: eriol-guest
Revision: 21868

* debian/patches/02_skip-wavelet-filters-coefficients-doctest.patches
  - Removed because exceed by 02_format-float-array-in-doctests.patch
* debian/patches/02_format-float-array-in-doctests.patch
  - Added upstream patch to fix representation float issues in doctests
    accross Python versions

Added:
  packages/pywavelets/trunk/debian/patches/02_format-float-array-in-doctests.patch
Modified:
  packages/pywavelets/trunk/debian/changelog
  packages/pywavelets/trunk/debian/patches/series
Deleted:
  packages/pywavelets/trunk/debian/patches/02_skip-wavelet-filters-coefficients-doctest.patch

Modified: packages/pywavelets/trunk/debian/changelog
===================================================================
--- packages/pywavelets/trunk/debian/changelog	2012-05-22 02:11:57 UTC (rev 21867)
+++ packages/pywavelets/trunk/debian/changelog	2012-05-22 04:17:55 UTC (rev 21868)
@@ -1,3 +1,13 @@
+pywavelets (0.2.0-5) UNRELEASED; urgency=low
+
+  * debian/patches/02_skip-wavelet-filters-coefficients-doctest.patches
+    - Removed because exceed by 02_format-float-array-in-doctests.patch
+  * debian/patches/02_format-float-array-in-doctests.patch
+    - Added upstream patch to fix representation float issues in doctests
+      accross Python versions
+
+ -- Daniele Tricoli <eriol at mornie.org>  Tue, 22 May 2012 05:35:15 +0200
+
 pywavelets (0.2.0-4) unstable; urgency=low
 
   * debian/control
@@ -99,7 +109,7 @@
 
   [ Ondrej Certik ]
   * Added myself to uploaders
-  * lintian warning fix: python -> Python 
+  * lintian warning fix: python -> Python
 
  -- Piotr Ożarowski <piotr at debian.org>  Wed, 09 Jul 2008 22:13:00 +0200
 

Added: packages/pywavelets/trunk/debian/patches/02_format-float-array-in-doctests.patch
===================================================================
--- packages/pywavelets/trunk/debian/patches/02_format-float-array-in-doctests.patch	                        (rev 0)
+++ packages/pywavelets/trunk/debian/patches/02_format-float-array-in-doctests.patch	2012-05-22 04:17:55 UTC (rev 21868)
@@ -0,0 +1,60 @@
+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/02_skip-wavelet-filters-coefficients-doctest.patch
===================================================================
--- packages/pywavelets/trunk/debian/patches/02_skip-wavelet-filters-coefficients-doctest.patch	2012-05-22 02:11:57 UTC (rev 21867)
+++ packages/pywavelets/trunk/debian/patches/02_skip-wavelet-filters-coefficients-doctest.patch	2012-05-22 04:17:55 UTC (rev 21868)
@@ -1,42 +0,0 @@
-Description: Wavelet filters coefficients doctest is failing only in Python 2.7
- due Float repr improvements backported from 3.x. Although the doctest can be
- changed to check for True value comparing expected values with obtained values,
- this is ugly to see especially in doctests used also as documentation.
-Author: Daniele Tricoli <eriol at mornie.org>
-Forwarded: https://bitbucket.org/nigma/pywt/issue/3
-Last-Update: 2012-03-13
-
---- a/doc/source/ref/wavelets.rst
-+++ b/doc/source/ref/wavelets.rst
-@@ -184,9 +184,9 @@
-       Orthogonal:     True
-       Biorthogonal:   True
-       Symmetry:       asymmetric
--    >>> print wavelet.dec_lo, wavelet.dec_hi
-+    >>> print wavelet.dec_lo, wavelet.dec_hi # doctest: +SKIP
-     [0.70710678118654757, 0.70710678118654757] [-0.70710678118654757, 0.70710678118654757]
--    >>> print wavelet.rec_lo, wavelet.rec_hi
-+    >>> print wavelet.rec_lo, wavelet.rec_hi # doctest: +SKIP
-     [0.70710678118654757, 0.70710678118654757] [0.70710678118654757, -0.70710678118654757]
-
-
---- a/doc/source/regression/wavelet.rst
-+++ b/doc/source/regression/wavelet.rst
-@@ -78,13 +78,13 @@
- corresponds to lowpass and highpass decomposition filters and lowpass and
- highpass reconstruction filters respectively:
-
--    >>> w.dec_lo
-+    >>> w.dec_lo # doctest: +SKIP
-     [0.035226291882100656, -0.085441273882241486, -0.13501102001039084, 0.45987750211933132, 0.80689150931333875, 0.33267055295095688]
--    >>> w.dec_hi
-+    >>> w.dec_hi # doctest: +SKIP
-     [-0.33267055295095688, 0.80689150931333875, -0.45987750211933132, -0.13501102001039084, 0.085441273882241486, 0.035226291882100656]
--    >>> w.rec_lo
-+    >>> w.rec_lo # doctest: +SKIP
-     [0.33267055295095688, 0.80689150931333875, 0.45987750211933132, -0.13501102001039084, -0.085441273882241486, 0.035226291882100656]
--    >>> w.rec_hi
-+    >>> w.rec_hi # doctest: +SKIP
-     [0.035226291882100656, 0.085441273882241486, -0.13501102001039084, -0.45987750211933132, 0.80689150931333875, -0.33267055295095688]
-
- Another way to get the filters data is to use the :attr:`~Wavelet.filter_bank`

Modified: packages/pywavelets/trunk/debian/patches/series
===================================================================
--- packages/pywavelets/trunk/debian/patches/series	2012-05-22 02:11:57 UTC (rev 21867)
+++ packages/pywavelets/trunk/debian/patches/series	2012-05-22 04:17:55 UTC (rev 21868)
@@ -1,2 +1,3 @@
 01_fix-cython-0-14-compiling.patch
-02_skip-wavelet-filters-coefficients-doctest.patch
+02_format-float-array-in-doctests.patch
+

More information about the Python-modules-commits mailing list