[Python-apps-commits] r8948 - in packages/cython/trunk/debian (4 files)

[yoh at users.alioth.debian.org]

    Date: Monday, July 16, 2012 @ 16:11:11
  Author: yoh
Revision: 8948

dropping patches deb_tempdisable_numpy_doctests, python27-testsuite-fix.patch

Modified:
  packages/cython/trunk/debian/changelog
  packages/cython/trunk/debian/patches/series
Deleted:
  packages/cython/trunk/debian/patches/deb_tempdisable_numpy_doctests
  packages/cython/trunk/debian/patches/python27-testsuite-fix.patch

Modified: packages/cython/trunk/debian/changelog
===================================================================
--- packages/cython/trunk/debian/changelog	2012-07-16 16:10:33 UTC (rev 8947)
+++ packages/cython/trunk/debian/changelog	2012-07-16 16:11:11 UTC (rev 8948)
@@ -2,6 +2,7 @@
 
   * Fresh upstream release (Closes: #671070)
     - required to BFS for new python-pymtp
+    - dropping patches deb_tempdisable_numpy_doctests, python27-testsuite-fix.patch
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Sat, 30 Jun 2012 12:34:14 -0400
 

Deleted: packages/cython/trunk/debian/patches/deb_tempdisable_numpy_doctests
===================================================================
--- packages/cython/trunk/debian/patches/deb_tempdisable_numpy_doctests	2012-07-16 16:10:33 UTC (rev 8947)
+++ packages/cython/trunk/debian/patches/deb_tempdisable_numpy_doctests	2012-07-16 16:11:11 UTC (rev 8948)
@@ -1,21 +0,0 @@
-Index: cython-0.14.1/tests/run/numpy_test.pyx
-===================================================================
---- cython-0.14.1.orig/tests/run/numpy_test.pyx	2011-04-06 17:28:18.490087772 +0000
-+++ cython-0.14.1/tests/run/numpy_test.pyx	2011-04-06 17:28:58.626088527 +0000
-@@ -174,14 +174,14 @@
-         ...
-     ValueError: Buffer dtype mismatch, expected 'int' but got 'float' in 'DoubleInt.y'
- 
--    >>> print(test_packed_align(np.zeros((1,), dtype=np.dtype('b,i', align=False))))
-+    >>> print(test_packed_align(np.zeros((1,), dtype=np.dtype('b,i', align=False)))) # doctest: +SKIP
-     array([(22, 23)], 
-           dtype=[('f0', '|i1'), ('f1', '!i4')])
-     >>> print(test_unpacked_align(np.zeros((1,), dtype=np.dtype('b,i', align=True))))
-     array([(22, 23)], 
-           dtype=[('f0', '|i1'), ('', '|V3'), ('f1', '!i4')])
- 
--    >>> print(test_packed_align(np.zeros((1,), dtype=np.dtype('b,i', align=True)))) #doctest: +ELLIPSIS
-+    >>> print(test_packed_align(np.zeros((1,), dtype=np.dtype('b,i', align=True)))) #doctest: +ELLIPSIS +SKIP
-     Traceback (most recent call last):
-         ...
-     ValueError: ...

Deleted: packages/cython/trunk/debian/patches/python27-testsuite-fix.patch
===================================================================
--- packages/cython/trunk/debian/patches/python27-testsuite-fix.patch	2012-07-16 16:10:33 UTC (rev 8947)
+++ packages/cython/trunk/debian/patches/python27-testsuite-fix.patch	2012-07-16 16:11:11 UTC (rev 8948)
@@ -1,43 +0,0 @@
-Description: Upstream fix (post 0.15.1 release) to work around changes
- in Python 2.7's indexing error message.
-Origin: https://github.com/cython/cython/commit/b623fb856a82d2ece1e2f04fb32309384ab0cb7e.diff
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cython/+bug/901840/+index
-Forwarded: not-needed
-
-diff --git a/tests/run/dict_getitem.pyx b/tests/run/dict_getitem.pyx
-index 845ac7f..40e05e8 100644
---- a/tests/run/dict_getitem.pyx
-+++ b/tests/run/dict_getitem.pyx
-@@ -21,7 +21,7 @@ def test(dict d, index):
- 
-     >>> test(None, 1) # doctest: +ELLIPSIS
-     Traceback (most recent call last):
--    TypeError: ...subscriptable...
-+    TypeError: ...object...
-     """
-     return d[index]
- 
-diff --git a/tests/run/index.pyx b/tests/run/index.pyx
-index 22cec2b..74eec6e 100644
---- a/tests/run/index.pyx
-+++ b/tests/run/index.pyx
-@@ -1,15 +1,13 @@
- __doc__ = u"""
--    >>> index_object(100, 100)
-+    >>> index_object(100, 100)       # doctest: +ELLIPSIS
-     Traceback (most recent call last):
-     ...
--    TypeError: 'int' object is unsubscriptable
-+    TypeError: 'int' object ...
- """
- 
- import sys
--if sys.version_info >= (2,7):
--    __doc__ = __doc__.replace(u'is unsubscriptable', u'is not subscriptable')
--elif sys.version_info < (2,5):
--    __doc__ = __doc__.replace(u"'int' object is unsubscriptable", u'unsubscriptable object')
-+if sys.version_info < (2,5):
-+    __doc__ = __doc__.replace(u"'int' object ...", u'unsubscriptable object')
- 
- import cython
- 

Modified: packages/cython/trunk/debian/patches/series
===================================================================
--- packages/cython/trunk/debian/patches/series	2012-07-16 16:10:33 UTC (rev 8947)
+++ packages/cython/trunk/debian/patches/series	2012-07-16 16:11:11 UTC (rev 8948)
@@ -1,3 +1 @@
-deb_tempdisable_numpy_doctests
-python27-testsuite-fix.patch
 typo-stings