Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 30c9e8f

Browse filesBrowse files
committed
Merge remote-tracking branch 'matplotlib/v2.x'
Conflicts: .travis.yml - use slightly different incantations to install basemap (git vs tarball) on master vs v2.x. Left master version as-is.
2 parents 8758df3 + 4f8d25d commit 30c9e8f
Copy full SHA for 30c9e8f

File tree

Expand file treeCollapse file tree

1 file changed

+1
-0
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-0
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ install:
136136
# We have to install it after matplotlib to avoid pulling in MPL as
137137
# a dependency
138138
if [[ $BUILD_DOCS == true ]]; then
139+
pip install pyshp!=1.2.8
139140
pip install git+https://github.com/matplotlib/basemap.git
140141
fi;
141142

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.