Merge pull request #648 from efiring/numpy_LooseVersion

efiring · efiring · commit 346615e4c4bf · 2011-12-31T14:18:01.000-08:00
Numpy loose version
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -154,8 +154,8 @@
 
 import numpy
 from distutils import version
-expected_version = version.StrictVersion(__version__numpy__)
-found_version = version.StrictVersion(numpy.__version__)
+expected_version = version.LooseVersion(__version__numpy__)
+found_version = version.LooseVersion(numpy.__version__)
 if not found_version >= expected_version:
     raise ImportError(
         'numpy %s or later is required; you have %s' % (
diff --git a/setupext.py b/setupext.py
@@ -46,7 +46,7 @@
 import os
 import re
 import subprocess
-from distutils import sysconfig
+from distutils import sysconfig, version
 
 basedir = {
     'win32'  : ['win32_static',],
@@ -550,8 +550,8 @@ def check_for_numpy(min_version):
                       min_version)
         return False
 
-    expected_version = min_version.split('.')
-    found_version = numpy.__version__.split('.')
+    expected_version = version.LooseVersion(min_version)
+    found_version = version.LooseVersion(numpy.__version__)
     if not found_version >= expected_version:
         print_message(
             'numpy %s or later is required; you have %s' %
