Update checks and documentation to refer to Numpy 1.4 as the minimum Numpy version.

mdboom · mdboom · commit bf73b9088e0c · 2011-11-14T08:31:34.000-05:00
diff --git a/INSTALL b/INSTALL
@@ -45,7 +45,7 @@ progress::
     >>> import numpy
     >>> print numpy.__version__
 
-matplotlib requires numpy version 1.1 or later.  Although it is not a
+matplotlib requires numpy version 1.4 or later.  Although it is not a
 requirement to use matplotlib, we strongly encourage you to install
 `ipython <http://ipython.org>`_, which is an interactive
 shell for python that is matplotlib-aware.
@@ -182,7 +182,7 @@ libraries themselves.
 :term:`python` 2.4 (or later but not python3)
     matplotlib requires python 2.4 or later (`download <http://www.python.org/download/>`__)
 
-:term:`numpy` 1.1 (or later)
+:term:`numpy` 1.4 (or later)
     array support for python (`download
     <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`__)
 
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -152,9 +152,9 @@
 
 import numpy
 nmajor, nminor = [int(n) for n in numpy.__version__.split('.')[:2]]
-if not (nmajor > 1 or (nmajor == 1 and nminor >= 1)):
+if not (nmajor > 1 or (nmajor == 1 and nminor >= 4)):
     raise ImportError(
-            'numpy 1.1 or later is required; you have %s' % numpy.__version__)
+            'numpy 1.4 or later is required; you have %s' % numpy.__version__)
 
 def is_string_like(obj):
     if hasattr(obj, 'shape'): return 0
diff --git a/setupext.py b/setupext.py
@@ -546,13 +546,13 @@ def check_for_numpy():
         import numpy
     except ImportError:
         print_status("numpy", "no")
-        print_message("You must install numpy 1.1 or later to build matplotlib.")
+        print_message("You must install numpy 1.4 or later to build matplotlib.")
         return False
     nn = numpy.__version__.split('.')
     if not (int(nn[0]) >= 1 and int(nn[1]) >= 1):
-        if not (int(nn[0]) >= 2):
+        if not (int(nn[0]) >= 4):
             print_message(
-               'numpy 1.1 or later is required; you have %s' %
+               'numpy 1.4 or later is required; you have %s' %
                numpy.__version__)
             return False
     module = Extension('test', [])
