[linop] 01/01: d/patches/*: remove temp pacthes, fixed upstream

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository linop.

commit b44da2d65ed9e717d38d20eebe71ac0f1d615b67
Author: Ghislain Vaillant <ghisvail at gmail.com>
Date:   Mon Apr 7 10:22:58 2014 +0100

    d/patches/*: remove temp pacthes, fixed upstream
---
 debian/patches/001-fix-setup-script.diff | 14 -------
 debian/patches/002-fix-aslinop-test.diff | 71 --------------------------------
 2 files changed, 85 deletions(-)

diff --git a/debian/patches/001-fix-setup-script.diff b/debian/patches/001-fix-setup-script.diff
deleted file mode 100644
index 8d632cb..0000000
--- a/debian/patches/001-fix-setup-script.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: fix setuptools blocking pbuilder
-Forwarded: not-needed
-Author: Ghislain Vaillant <ghisvail at gmail.com>
---- a/setup.py
-+++ b/setup.py
-@@ -2,7 +2,7 @@
- 
- import os
- import sys
--from setuptools import setup, find_packages
-+#from setuptools import setup, find_packages
- 
- 
- DISTNAME = 'linop'
diff --git a/debian/patches/002-fix-aslinop-test.diff b/debian/patches/002-fix-aslinop-test.diff
deleted file mode 100644
index 6e0fcf7..0000000
--- a/debian/patches/002-fix-aslinop-test.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Workaround for failing test suite with Py3
- The test suite fails with Python 3 due to an ImportError on scipy.sparse. The
- test suite however passes when using Python 2. This patch just surrounds the
- scipy sparse specific code with try/catch blocks.
-Forwarded: not-needed
-Author: Ghislain Vaillant <ghisvail at gmail.com>
---- a/linop/linop.py
-+++ b/linop/linop.py
-@@ -617,18 +617,22 @@
-     .. versionadded:: 0.4
- 
-     """
--    from scipy.sparse import isspmatrix
-+    #from scipy.sparse import isspmatrix
- 
-     if isinstance(A, LinearOperator):
-         return A
- 
--    elif isinstance(A, np.ndarray) or isinstance(A, np.matrix):
-+    if isinstance(A, np.ndarray) or isinstance(A, np.matrix):
-         return MatrixLinearOperator(A)
- 
--    elif isspmatrix(A):
--        return MatrixLinearOperator(A)
-+    try:
-+        from scipy.sparse import isspmatrix
-+        if isspmatrix(A):
-+            return MatrixLinearOperator(A)
-+    except:
-+        pass
- 
--    elif hasattr(A, 'shape'):
-+    if hasattr(A, 'shape'):
-         nargout, nargin = A.shape
-         matvec = None
-         rmatvec = None
---- a/tests/test_linop.py
-+++ b/tests/test_linop.py
-@@ -343,16 +343,21 @@
-     A = lo.aslinearoperator(M_as_mat)
-     assert_(isinstance(A, lo.MatrixOperator))
- 
--    import scipy.sparse.linalg.interface as ssli
--    M = ssli.MatrixLinearOperator(M_as_mat)
--    A = lo.aslinearoperator(M)
--    assert_(isinstance(A, lo.LinearOperator))
--
--    import scipy.sparse as ssp
--    for sparse_type in (ssp.bsr_matrix, ssp.coo_matrix, ssp.csc_matrix,
--                        ssp.csr_matrix, ssp.dia_matrix, ssp.dok_matrix,
--                        ssp.lil_matrix):
--        M_as_mat = sparse_type((3, 3))
--        A = lo.aslinearoperator(M_as_mat)
-+    try:
-+        import scipy.sparse.linalg.interface as ssli
-+        M = ssli.MatrixLinearOperator(M_as_mat)
-+        A = lo.aslinearoperator(M)
-         assert_(isinstance(A, lo.LinearOperator))
-+    except:
-+        pass
- 
-+    try:
-+        import scipy.sparse as ssp
-+        for sparse_type in (ssp.bsr_matrix, ssp.coo_matrix, ssp.csc_matrix,
-+                            ssp.csr_matrix, ssp.dia_matrix, ssp.dok_matrix,
-+                            ssp.lil_matrix):
-+            M_as_mat = sparse_type((3, 3))
-+            A = lo.aslinearoperator(M_as_mat)
-+            assert_(isinstance(A, lo.LinearOperator))
-+    except:
-+        pass

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/linop.git