allow numpy 2.x to pass check for numpy >= 1.1 (reported by Nadia Dencheva)

svn path=/trunk/matplotlib/; revision=8128

Author: astraw

lib/matplotlib/__init__.py

@@ -147,8 +147,10 @@
 import numpy
 nn = numpy.__version__.split('.')
 if not (int(nn[0]) >= 1 and int(nn[1]) >= 1):
-    raise ImportError(
-            'numpy 1.1 or later is required; you have %s' % numpy.__version__)
+    if not (int(nn[0]) >= 2):
+        raise ImportError(
+                'numpy 1.1 or later is required; you have %s' %
+                numpy.__version__)
 
 def is_string_like(obj):
     if hasattr(obj, 'shape'): return 0

setupext.py

@@ -516,9 +516,11 @@ def check_for_numpy():
         return False
     nn = numpy.__version__.split('.')
     if not (int(nn[0]) >= 1 and int(nn[1]) >= 1):
-        print_message(
-           'numpy 1.1 or later is required; you have %s' % numpy.__version__)
-        return False
+        if not (int(nn[0]) >= 2):
+            print_message(
+               'numpy 1.1 or later is required; you have %s' %
+               numpy.__version__)
+            return False
     module = Extension('test', [])
     add_numpy_flags(module)
     add_base_flags(module)