Backporting numpy version check fix to 0.99 branch

mdboom · mdboom · commit 19873d1b80af · 2010-02-22T16:22:28.000Z
svn path=/branches/v0_99_maint/; revision=8146
diff --git a/doc/make.py b/doc/make.py
@@ -65,8 +65,9 @@ def latex():
         print 'latex build has not been tested on windows'
 
 def clean():
-    shutil.rmtree("build")
-    shutil.rmtree("examples")
+    for dirpath in ['build', 'examples']:
+        if os.path.exists(dirpath):
+            shutil.rmtree(dirpath)
     for pattern in ['mpl_examples/api/*.png',
                     'mpl_examples/pylab_examples/*.png',
                     'mpl_examples/pylab_examples/*.pdf',
diff --git a/setupext.py b/setupext.py
@@ -499,9 +499,10 @@ 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]) >= 1:
+            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)
