Merge pull request #626 from arokem/shm-loose-version

Use LooseVersion to check for scipy versions
dipy · Apr 6, 2015 · 49cb6e3 · 49cb6e3
2 parents d1cf88e + 235c22d
commit 49cb6e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dipy/core/optimize.py b/dipy/core/optimize.py
@@ -11,7 +11,7 @@
 import scipy.optimize as opt
 from dipy.utils.six import with_metaclass
 
-SCIPY_LESS_0_12 = LooseVersion(scipy.__version__) < '0.12'
+SCIPY_LESS_0_12 = LooseVersion(scipy.version.short_version) < '0.12'
 
 if not SCIPY_LESS_0_12:
     from scipy.optimize import minimize

diff --git a/dipy/reconst/shm.py b/dipy/reconst/shm.py
@@ -37,10 +37,10 @@
 from dipy.core.onetime import auto_attr
 from dipy.reconst.cache import Cache
 
-from distutils.version import StrictVersion
+from distutils.version import LooseVersion
 import scipy
 
-if StrictVersion(scipy.version.short_version) >= StrictVersion('0.15.0'):
+if LooseVersion(scipy.version.short_version) >= LooseVersion('0.15.0'):
     SCIPY_15_PLUS = True
 else:
     SCIPY_15_PLUS = False