-
Notifications
You must be signed in to change notification settings - Fork 362
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Backport PRs for 0.20.1 #1904
Merged
Merged
Backport PRs for 0.20.1 #1904
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ab85a60
Update streamplot test for Matplotlib 3.5.0rc1
QuLogic 04f794b
Regenerate all tick test images
QuLogic 2f92abd
Remove use of distutils
QuLogic 112af97
Loosen OSGB tests if grids are unavailable
QuLogic bafff30
Merge pull request #1894 from georgemccabe/master
greglucas 1e652d6
Update streamplot test for Matplotlib 3.5.0rc1
QuLogic ebf1f11
Use Gridliner transform for inline labels also
QuLogic 70d6f6e
Merge pull request #1892 from greglucas/pcolor-shading-nearest
QuLogic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+824 Bytes
(100%)
lib/cartopy/tests/mpl/baseline_images/mpl/test_mpl_integration/streamplot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+166 Bytes
(100%)
lib/cartopy/tests/mpl/baseline_images/mpl/test_ticks/xticks_cylindrical.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+367 Bytes
(100%)
lib/cartopy/tests/mpl/baseline_images/mpl/test_ticks/xticks_no_transform.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.32 KB
(100%)
lib/cartopy/tests/mpl/baseline_images/mpl/test_ticks/xyticks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+874 Bytes
(100%)
lib/cartopy/tests/mpl/baseline_images/mpl/test_ticks/yticks_cylindrical.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+262 Bytes
(100%)
lib/cartopy/tests/mpl/baseline_images/mpl/test_ticks/yticks_no_transform.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,11 +26,11 @@ | |
|
||
import fnmatch | ||
import os | ||
import shutil | ||
import subprocess | ||
import warnings | ||
from collections import defaultdict | ||
from distutils.spawn import find_executable | ||
from distutils.sysconfig import get_config_var | ||
from sysconfig import get_config_var | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. E402 module level import not at top of file |
||
|
||
from setuptools import Command, Extension, convert_path, setup | ||
|
||
|
@@ -142,7 +142,7 @@ def find_package_tree(root_path, root_package): | |
|
||
# Proj | ||
def find_proj_version_by_program(conda=None): | ||
proj = find_executable('proj') | ||
proj = shutil.which('proj') | ||
if proj is None: | ||
print( | ||
'Proj {} must be installed.'.format( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
E402 module level import not at top of file