SF.net SVN: matplotlib:[8146] branches/v0_99_maint

[<md...@us...>]

Revision: 8146
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8146&view=rev
Author:   mdboom
Date:     2010-02-22 16:22:28 +0000 (Mon, 22 Feb 2010)

Log Message:
-----------
Backporting numpy version check fix to 0.99 branch

Modified Paths:
--------------
    branches/v0_99_maint/doc/make.py
    branches/v0_99_maint/setupext.py

Modified: branches/v0_99_maint/doc/make.py
===================================================================
--- branches/v0_99_maint/doc/make.py	2010-02-22 14:31:45 UTC (rev 8145)
+++ branches/v0_99_maint/doc/make.py	2010-02-22 16:22:28 UTC (rev 8146)
@@ -65,8 +65,9 @@
         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',

Modified: branches/v0_99_maint/setupext.py
===================================================================
--- branches/v0_99_maint/setupext.py	2010-02-22 14:31:45 UTC (rev 8145)
+++ branches/v0_99_maint/setupext.py	2010-02-22 16:22:28 UTC (rev 8146)
@@ -499,9 +499,10 @@
         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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.