Merge branch 'v1.1.x' of github.com:matplotlib/matplotlib into merge_v1.1.x_3

Author: efiring

lib/matplotlib/__init__.py

@@ -165,8 +165,8 @@ def byte2str(b): return b
 
 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' % (

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',],
@@ -558,8 +558,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' %