Merge remote-tracking branch 'tacaswell/drop_32'

mdboom · mdboom · commit 655b0786e09e · 2014-07-11T15:05:37.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,8 @@ language: python
 python:
   - 2.6
   - 2.7
-  - 3.2
   - 3.3
+  - 3.4
 
 install:
   - pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing pillow
diff --git a/INSTALL b/INSTALL
@@ -53,7 +53,7 @@ Next, we need to get matplotlib installed.  We provide prebuilt
 binaries for OS X and Windows on the matplotlib `download
 <http://matplotlib.org/downloads.html>`_.  Click on
 the latest release of the "matplotlib" package, choose your python
-version (2.6, 2.7 or 3.2) and your platform (macosx or win32).  If you
+version (2.6, 2.7, 3.3, or 3.4) and your platform (macosx or win32).  If you
 have any problems, please check the :ref:`installing-faq`, search
 using Google, and/or post a question the `mailing list
 <http://sourceforge.net/project/showfiles.php?group_id=80706>`_.
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -11,9 +11,15 @@ For a list of all of the issues and pull requests since the last
 revision, see the :ref:`github-stats`.
 
 .. note::
-   Matplotlib version 1.1 is the last major release compatible with Python
-   versions 2.4 to 2.7.  matplotlib 1.2 and later require
-   versions 2.6, 2.7, and 3.1 and higher.
+   matplotlib 1.4 supports Python 2.6, 2.7, 3.3, and 3.4
+
+   matplotlib 1.3 supports Python 2.6, 2.7, 3.2, and 3.3
+
+   matplotlib 1.2 supports Python 2.6, 2.7, and 3.1
+
+   matplotlib 1.1 supports Python 2.4 to 2.7
+
+
 
 .. contents:: Table of Contents
    :depth: 3
