From 028fb533688bb234821b449488c177c3a863c64f Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Mon, 6 Oct 2014 14:43:44 -0500
Subject: [PATCH] Bump matplotlib to 1.2

---
 .travis.yml      | 2 +-
 DEPENDS.txt      | 2 +-
 requirements.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 746dda9e..4f1ac94f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ before_install:
     - if [[ $ENV != python=2.6* ]]; then
             travis_retry pip install matplotlib --no-index --find-links=http://wheels.scikit-image.org/;
       else
-         pip install matplotlib==1.1.0;
+         pip install matplotlib==1.2.0;
       fi
     - pip install pillow  --no-index --find-links=http://wheels.scikit-image.org/
     - python check_bento_build.py
diff --git a/DEPENDS.txt b/DEPENDS.txt
index 3711796c..0003de6b 100644
--- a/DEPENDS.txt
+++ b/DEPENDS.txt
@@ -12,7 +12,7 @@ You can use pip to automatically install the base dependencies as follows::
 Runtime requirements
 --------------------
 * `SciPy >= 0.9 <http://scipy.org>`__
-* `Matplotlib >= 1.0 <http://matplotlib.sf.net>`__
+* `Matplotlib >= 1.2 <http://matplotlib.sf.net>`__
 * `NetworkX >= 1.8 <https://networkx.github.io>`__
 * `Pillow <https://pypi.python.org/pypi/Pillow>`__
    (or `PIL <http://www.pythonware.com/products/pil/>`__)
diff --git a/requirements.txt b/requirements.txt
index 13a6f59b..2b55f91e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cython>=0.19.2
-matplotlib>=1.1
+matplotlib>=1.2
 numpy>=1.6
 scipy>=0.9
 six>=1.3