Enforce numpy >= 1.1 and python >= 2.3 when importing matplotlib.

efiring · efiring · commit e4c9a1ab0d00 · 2008-04-24T18:31:10.000Z
Numpy svn passes the test now.

svn path=/trunk/matplotlib/; revision=5073
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+
+2008-04-24 Make numpy 1.1 and python 2.3 required when importing
+           matplotlib - EF
+
 2008-04-24 Fix compilation issues on VS2003 (Thanks Martin Spacek for
            all the help) - MGD
 
@@ -3443,4 +3447,4 @@ This is the Old, stale, never used changelog
 2003-11-21 - make a dash-dot dict for the GC
 
 2003-12-15 - fix install path bug
-t
+t
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -112,10 +112,13 @@
 #else: _have_pkg_resources = True
 
 if not _python23:
-    def enumerate(seq):
-        for i in range(len(seq)):
-            yield i, seq[i]
+    raise SystemExit('matplotlib requires Python 2.3 or later')
 
+import numpy
+nn = numpy.__version__.split('.')
+if not (int(nn[0]) >= 1 and int(nn[1]) >= 1):
+    raise SystemExit(
+            'numpy >= 1.1 is required; you have %s' % numpy.__version__)
 
 def is_string_like(obj):
     if hasattr(obj, 'shape'): return 0
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -693,10 +693,7 @@ def update_from_data_xy(self, xy, ignore=None):
 
         if len(xy) == 0:
             return
-        try:
-            xym = ma.masked_invalid(xy) # maybe add copy=False
-        except AttributeError:   # masked_invalid not exposed in npy 1.04
-            xym = ma.masked_where(~npy.isfinite(xy), xy)
+        xym = ma.masked_invalid(xy) # maybe add copy=False
         if (xym.count(axis=1)!=2).all():
             return
 
