merge

theano/compile/tests/test_debugmode.py

 import sys
-import numpy, scipy
+import numpy
 
 import scipy.sparse
 from theano import gof

theano/sparse/__init__.py

+import sys,scipy
 
-from basic import *
+enable_sparse=True
+if not scipy.__version__.startswith('0.7.'):
+    sys.stderr.write("WARNING: scipy version = %s. We request version >=0.7.0 for the sparse code as it has bugs fixed in the sparse matrix code.\n" % scipy.__version__)
+    enable_sparse=False
+
+if enable_sparse:
+    from basic import *
 

theano/sparse/basic.py

@@ -29,10 +29,6 @@ _mtypes = [sparse.csc_matrix, sparse.csr_matrix]
 #* new class ``bsr_matrix`` : the Block CSR format
 _mtype_to_str = {sparse.csc_matrix: "csc", sparse.csr_matrix: "csr"}
 
-import scipy
-if not scipy.__version__.startswith('0.7.'):
-    sys.stderr.write("WARNING: scipy version = %s. We prefer version >=0.7.0 because it has bugs fixed in the sparse matrix code.\n" % scipy.__version__)
-
 def _is_sparse_variable(x):
     """
     @rtype: boolean

theano/sparse/tests/test_basic.py

 import scipy.sparse
 from theano.sparse import *
 
+from nose.plugins.skip import SkipTest
+if enable_sparse == False:
+    raise SkipTest('Optional package sparse disabled')
+
 import random
 import unittest
 import theano

theano/tests/unittest_tools.py

 import unittest
 import numpy
 import theano.tensor as T
-from ..configparser import config, AddConfigVar, IntParam
+from theano.configparser import config, AddConfigVar, IntParam
 import os, sys
 
 AddConfigVar('unittests.rseed',