Merge pull request #772 from ilanschnell/master

setup.py

@@ -4,17 +4,15 @@
 #   * Figure out how to compile and install documentation automatically
 #   * Add download_url
 
-# Detect whether or not the user has setuptools and use the bundled
-# distribute_setup.py bootstrap module if they don't.
+import os
+import subprocess
+from fnmatch import fnmatchcase
+from distutils.util import convert_path
 try:
-    from setuptools import setup, find_packages
+    from setuptools import setup
 except ImportError:
-    import distribute_setup
-    distribute_setup.use_setuptools()
-    from setuptools import setup, find_packages
+    from distutils.core import setup
 
-import os
-import subprocess
 
 CLASSIFIERS = """\
 Development Status :: 4 - Beta
@@ -54,6 +52,23 @@ ISRELEASED          = False
 VERSION             = '%d.%d.%d%s' % (MAJOR, MINOR, MICRO, SUFFIX)
 
 
+def find_packages(where='.', exclude=()):
+    out = []
+    stack=[(convert_path(where), '')]
+    while stack:
+        where, prefix = stack.pop(0)
+        for name in os.listdir(where):
+            fn = os.path.join(where,name)
+            if ('.' not in name and os.path.isdir(fn) and
+                os.path.isfile(os.path.join(fn, '__init__.py'))
+            ):
+                out.append(prefix+name)
+                stack.append((fn, prefix+name+'.'))
+    for pat in list(exclude) + ['ez_setup', 'distribute_setup']:
+        out = [item for item in out if not fnmatchcase(item, pat)]
+    return out
+
+
 def git_version():
     """
     Return the sha1 of local git HEAD as a string.

theano/sandbox/linalg/tests/test_linalg.py

-from pkg_resources import parse_version as V
-
 import numpy
 import numpy.linalg
 

theano/sparse/__init__.py

-from pkg_resources import parse_version as V
 import sys
 
 try:
     import scipy
-    enable_sparse = V(scipy.__version__) >= V('0.7')
-
+    scipy_ver = [int(n) for n in scipy.__version__.split('.')[:2]]
+    enable_sparse = bool(scipy_ver >= [0, 7])
     if not enable_sparse:
         sys.stderr.write("WARNING: scipy version = %s."
                 " We request version >=0.7.0 for the sparse code as it has"