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.

Sign up for GitHub

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

Jump to bottom

Wrap grdsample #1380

Merged
merged 20 commits into from
Aug 9, 2021
Merged

Wrap grdsample #1380

merged 20 commits into from
Aug 9, 2021

Conversation

willschlitzer
Copy link
Contributor

@willschlitzer willschlitzer commented Jul 8, 2021 •
edited by weiji14
Loading

This pull requests wraps the GMT module grdsample.

Fixes #1422

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.

Slash Commands

You can write slash commands (/command) in the first line of a comment to perform
specific operations. Supported slash commands are:

  • /format: automatically format and lint the code
  • /test-gmt-dev: run full tests on the latest GMT development version

@willschlitzer willschlitzer added the feature Brand new feature label Jul 8, 2021
@willschlitzer willschlitzer added this to the 0.5.0 milestone Jul 8, 2021
@willschlitzer willschlitzer self-assigned this Jul 8, 2021
@willschlitzer willschlitzer changed the title WIP: Wrap grdsample Wrap grdsample Jul 11, 2021
weiji14
weiji14 reviewed Jul 13, 2021
View reviewed changes
Copy link
Member

@weiji14 weiji14 left a comment

Choose a reason for hiding this comment

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

Thanks @willschlitzer! Just a few suggestions regarding the use of common aliases.

pygmt/src/grdsample.py Outdated Show resolved Hide resolved
pygmt/src/grdsample.py Outdated Show resolved Hide resolved
pygmt/src/grdsample.py Outdated Show resolved Hide resolved
pygmt/src/grdsample.py Show resolved Hide resolved
pygmt/src/grdsample.py Show resolved Hide resolved
@willschlitzer @weiji14
Apply suggestions from code review
9f8c0c7 
Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
@willschlitzer willschlitzer marked this pull request as ready for review July 16, 2021 15:56
weiji14
weiji14 reviewed Jul 17, 2021
View reviewed changes
pygmt/helpers/decorators.py Outdated Show resolved Hide resolved
pygmt/src/grdsample.py Outdated Show resolved Hide resolved
@willschlitzer @weiji14
Apply suggestions from code review
ad609c3 
Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
weiji14
weiji14 approved these changes Jul 21, 2021
View reviewed changes
Copy link
Member

@weiji14 weiji14 left a comment

Choose a reason for hiding this comment

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

Looks good to me. But please hold off on merging until we decide on whether we want a PyGMT v0.4.1 release, or go straight to v0.5.0 as discussed in #1356 (comment)

@maxrjones maxrjones mentioned this pull request Jul 21, 2021
Closed
@weiji14 weiji14 added the final review call This PR requires final review and approval from a second reviewer label Aug 8, 2021
weiji14
weiji14 reviewed Aug 8, 2021
View reviewed changes
Copy link
Member

@weiji14 weiji14 left a comment

Choose a reason for hiding this comment

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

Thanks for your patience @willschlitzer, now that the v0.4.1 tag is behind, we can finally finish this PR (and all the other ones you have lined up). Could you please resolve the conflict on decorators.py and fix one tiny issue I suggested below?

pygmt/src/grdsample.py Outdated Show resolved Hide resolved
@willschlitzer @weiji14
Apply suggestions from code review
ac5fee4 
Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
@willschlitzer
Copy link
Contributor Author

@weiji14 I made the changes you suggested

seisman
seisman approved these changes Aug 8, 2021
View reviewed changes
pygmt/tests/test_grdsample.py Outdated Show resolved Hide resolved
pygmt/tests/test_grdsample.py Outdated Show resolved Hide resolved
seisman
seisman reviewed Aug 8, 2021
View reviewed changes
pygmt/tests/test_grdsample.py Outdated Show resolved Hide resolved
pygmt/tests/test_grdsample.py Outdated Show resolved Hide resolved
michaelgrund
michaelgrund approved these changes Aug 8, 2021
View reviewed changes
Copy link
Member

@michaelgrund michaelgrund left a comment

Choose a reason for hiding this comment

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

Fine to merge after the suggestions by @seisman are implemented!

@willschlitzer @seisman
Apply suggestions from code review
4727aae 
Co-authored-by: Dongdong Tian <seisman.info@gmail.com>
@weiji14 weiji14 mentioned this pull request Aug 8, 2021
Closed
seisman
seisman reviewed Aug 8, 2021
View reviewed changes
pygmt/src/grdsample.py Outdated
@use_alias(
G="outgrid",
J="projection",
I="increment",
Copy link
Member

Choose a reason for hiding this comment

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

It seems other modules (e.g., grdfilter) use the alias spacing rather than increment. We should keep the alias consistent, no?

willschlitzer
willschlitzer commented Aug 9, 2021
View reviewed changes
pygmt/src/grdsample.py Outdated Show resolved Hide resolved
willschlitzer
willschlitzer commented Aug 9, 2021
View reviewed changes
pygmt/src/grdsample.py Outdated Show resolved Hide resolved
willschlitzer
willschlitzer commented Aug 9, 2021
View reviewed changes
pygmt/src/grdsample.py Outdated Show resolved Hide resolved
weiji14
weiji14 approved these changes Aug 9, 2021
View reviewed changes
Copy link
Member

@weiji14 weiji14 left a comment

Choose a reason for hiding this comment

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

🚀

@willschlitzer willschlitzer merged commit 85d78d6 into main Aug 9, 2021
@willschlitzer willschlitzer deleted the wrap-grdsample branch August 9, 2021 11:10
@seisman seisman removed the final review call This PR requires final review and approval from a second reviewer label Aug 9, 2021
@weiji14 weiji14 mentioned this pull request Sep 18, 2021
Merged
31 tasks
@weiji14 weiji14 mentioned this pull request Jan 31, 2022
Merged
6 tasks
sixy6e pushed a commit to sixy6e/pygmt that referenced this pull request Dec 21, 2022
@willschlitzer @weiji14
@michaelgrund @seisman
Wrap grdsample (GenericMappingTools#1380)
d143792 
*Wrap GMT module grdsample
*Add tests for grdsample

Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
Co-authored-by: Michael Grund <23025878+michaelgrund@users.noreply.github.com>
Co-authored-by: Dongdong Tian <seisman.info@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@seisman seisman seisman approved these changes

@maxrjones maxrjones maxrjones left review comments

@michaelgrund michaelgrund michaelgrund approved these changes

@weiji14 weiji14 weiji14 approved these changes

Assignees

@willschlitzer willschlitzer

Labels
feature Brand new feature
Projects
None yet
Milestone
0.5.0
Development

Successfully merging this pull request may close these issues.

grdsample alternative in pygmt
5 participants
@willschlitzer @michaelgrund @maxrjones @seisman @weiji14