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

tacaswell · tacaswell · commit 30c9e8fa726c · 2016-08-20T20:14:47.000-04:00
Conflicts:
	.travis.yml
	  - use slightly different incantations to install basemap (git
	vs tarball) on master vs v2.x.  Left master version as-is.
diff --git a/.travis.yml b/.travis.yml
@@ -136,6 +136,7 @@ install:
     # We have to install it after matplotlib to avoid pulling in MPL as
     # a dependency
     if [[ $BUILD_DOCS == true ]]; then
+      pip install pyshp!=1.2.8
       pip install git+https://github.com/matplotlib/basemap.git
     fi;
 
