Skip to content
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

Quickfix min elevation for new SRTM15+V2.1 earth relief grids #401

Merged
merged 1 commit into from
Mar 24, 2020

Conversation

weiji14
Copy link
Member

@weiji14 weiji14 commented Mar 24, 2020

Description of proposed changes

Upstream GMT has updated its earth relief grids to SRTM15+V2.1 to fill in NaN values (see GenericMappingTools/gmt#2920). This commit fixes the test failures due to incorrect minimum elevation values, and minor changes to the contour and grid plots.

Supersedes #350

Manually changed the doctests in the pygmt/clib/session.py file, and the tests in the test_datasets.py and test_info.py files. Plus ran the below two commands to generate new baseline images:

pytest --mpl-generate-path=baseline pygmt/tests/test_grdcontour.py
pytest --mpl-generate-path=baseline pygmt/tests/test_makecpt.py

Fixes #399

Reminders

  • Run make format and make check to make sure the code follows the style guide.
  • Add tests for new features or tests that would have caught the bug that you're fixing.
  • Add new public functions/methods/classes to doc/api/index.rst.
  • Write detailed docstrings for all functions/methods.
  • If adding new functionality, add an example to docstrings or tutorials.

Upstream GMT has updated its earth relief grids to SRTM15+V2.1 to fill in NaN values (see GenericMappingTools/gmt#2920). This commit fixes the test failures due to incorrect minimum elevation values, and minor changes to the contour and grid plots.
Copy link
Member

@seisman seisman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Thanks.

@weiji14
Copy link
Member Author

weiji14 commented Mar 24, 2020

Cool, how do you bypass the required check in #397 to merge in the PR? The 'Squash and Merge' button is grayed out for me.

@seisman
Copy link
Member

seisman commented Mar 24, 2020

It's also gray to me due to the strict branch protection rules. I had to go to "Settings"->"Branches" and change the rules temporarily to allow me merging that PR.

@weiji14
Copy link
Member Author

weiji14 commented Mar 24, 2020

Owh ok, that's annoying. I'll try that...

@weiji14 weiji14 merged commit da20303 into GenericMappingTools:master Mar 24, 2020
@weiji14 weiji14 deleted the earthrelief/srtm15+v2.1 branch March 24, 2020 05:16
@weiji14
Copy link
Member Author

weiji14 commented Mar 24, 2020

Cool, I've temporarily disabled the codecov/patch requirement until we can create a proper GMT 6.0/6.1 test for #397. Just need to keep note of that.

weiji14 referenced this pull request in weiji14/pygmt Mar 26, 2020
Refresh baseline plots to use SRTM15+V2.1 grids as per #401. Ran `pytest --mpl-generate-path=baseline pygmt/tests/test_grdview.py` to generate the png images.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some baseline images need to be updated
2 participants