Merge remote-tracking branch 'matplotlib/v2.x'

Author: tacaswell

.travis.yml

@@ -56,7 +56,7 @@ env:
 matrix:
   include:
     - python: 2.7
-      env: MOCK=mock NUMPY=numpy==1.6
+      env: MOCK=mock NUMPY=numpy==1.7.1
     - python: 3.4
       env: PYTHON_ARGS=-OO
     - python: 3.5

examples/showcase/mandelbrot.py

@@ -47,7 +47,9 @@ def mandelbrot_set(xmin, xmax, ymin, ymax, xn, yn, maxiter, horizon=2.0):
     # This line will generate warnings for null values but it is faster to
     # process them afterwards using the nan_to_num
     with np.errstate(invalid='ignore'):
-        M = np.nan_to_num(N + 1 - np.log(np.log(abs(Z)))/np.log(2) + log_horizon)
+        M = np.nan_to_num(N + 1 -
+                          np.log(np.log(abs(Z)))/np.log(2) +
+                          log_horizon)
 
     dpi = 72
     width = 10
@@ -65,9 +67,9 @@ def mandelbrot_set(xmin, xmax, ymin, ymax, xn, yn, maxiter, horizon=2.0):
 
     # Some advertisement for matplotlib
     year = time.strftime("%Y")
-    major, minor, micro = matplotlib.__version__.split('.', maxsplit=2)
+    major, minor, micro = matplotlib.__version__.split('.', 2)
     text = ("The Mandelbrot fractal set\n"
-            "Rendered with matplotlib %s.%s, %s — http://matplotlib.org"
+            "Rendered with matplotlib %s.%s, %s - http://matplotlib.org"
             % (major, minor, year))
     ax.text(xmin+.025, ymin+.025, text, color="white", fontsize=12, alpha=0.5)
 

lib/matplotlib/__init__.py

@@ -138,7 +138,7 @@
 __version__ = str(get_versions()['version'])
 del get_versions
 
-__version__numpy__ = str('1.6')  # minimum required numpy version
+__version__numpy__ = str('1.7.1')  # minimum required numpy version
 
 __bibtex__ = """@Article{Hunter:2007,
   Author    = {Hunter, J. D.},

setupext.py

@@ -973,10 +973,10 @@ def add_flags(self, ext):
                                   'NPY_1_7_API_VERSION'))
 
     def get_setup_requires(self):
-        return ['numpy>=1.6']
+        return ['numpy>=1.7.1']
 
     def get_install_requires(self):
-        return ['numpy>=1.6']
+        return ['numpy>=1.7.1']
 
 
 class LibAgg(SetupPackage):

tools/gh_api.py

@@ -43,6 +43,13 @@ def get_auth_token():
     if token is not None:
         return token
 
+    try:
+        with open(os.path.join(os.path.expanduser('~'), '.ghoauth')) as f:
+            token, = f
+            return token
+    except:
+        pass
+
     import keyring
     token = keyring.get_password('github', fake_username)
     if token is not None: