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 xyz2grd #636

Merged
merged 48 commits into from
Aug 9, 2021
Merged

Wrap xyz2grd #636

merged 48 commits into from
Aug 9, 2021

Conversation

carocamargo
Copy link
Contributor

@carocamargo carocamargo commented Sep 29, 2020 •
edited by willschlitzer
Loading

This PR wraps the function, xyz2grd and some of its parameters.

Closes #635

carocamargo and others added 18 commits September 17, 2020 21:36
@carocamargo
added gridfilter function
884bde7
@carocamargo
added to call gridfilter from grdops.py
c2a7d3e
@carocamargo
added grdfilter caller
2cb715d
@carocamargo
corrected indentation in grdfilter docstring, and made each function …
6139c17 
…with each owns decorators
@carocamargo
added usage example to grdfilter
d2e0aee
@carocamargo @weiji14
Update pygmt/gridops.py
db2cdc7 
Co-authored-by: Wei Ji <[email protected]>
@carocamargo @weiji14
Update pygmt/gridops.py
8b84039 
Co-authored-by: Wei Ji <[email protected]>
@carocamargo
added more optional aliases
a8dd55c
@carocamargo
Merge remote-tracking branch 'upstream/master' into newfeature
452d4f7
@carocamargo
Merge branch 'newfeature' of https://github.com/carocamargo/pygmt int…
269ce62 
…o newfeature
@carocamargo
added more optional aliases
9f47f01
@carocamargo
Update gridops.py
874bca4 
removed header from local conflict
@carocamargo @seisman
Update pygmt/gridops.py
0373c32 
Co-authored-by: Dongdong Tian <[email protected]>
@carocamargo @seisman
Update pygmt/gridops.py
fd64a4e 
Co-authored-by: Dongdong Tian <[email protected]>
@carocamargo @seisman
Update pygmt/gridops.py
df53508 
Co-authored-by: Dongdong Tian <[email protected]>
@carocamargo
formated code with black
6fae103
@carocamargo
added xyz2grd function to gridding.py
e653fa5
@carocamargo
modified __init__.py to import xyz2grd from gridding.py
3cfff68
@seisman seisman added the feature Brand new feature label Sep 29, 2020
@weiji14 weiji14 mentioned this pull request Oct 24, 2020
Merged
5 tasks
@weiji14 weiji14 force-pushed the newfeature_xyz2grd branch from 715136e to c6eba8a Compare October 24, 2020 09:47
@weiji14 weiji14 force-pushed the newfeature_xyz2grd branch from c6eba8a to b4742fe Compare October 24, 2020 09:48
@weiji14
Copy link
Member

weiji14 commented Oct 24, 2020

Sorry for the force-pushes, had to resolve a tricky merge conflict. If you run git switch newfeature_xyz2grd locally, and then git pull, this should bring in the resolved changes. It's getting late for me now, but I'll try and take a closer look at this next week.

@seisman seisman changed the title Newfeature xyz2grd wrapper Wrap xyz2grd Nov 4, 2020
@carocamargo
Copy link
Contributor Author

I'm sorry I disappeared, I kind that forgot about this :X .. Do I still need to push the changes, or not anymore?

@willschlitzer willschlitzer self-assigned this Jul 31, 2021
@willschlitzer
Copy link
Contributor

I removed some of the optional parameters to simplify this PR. I figure it's easier to get it merged and then add additional parameters in separate pull requests.

@maxrjones
Copy link
Member

I removed some of the optional parameters to simplify this PR. I figure it's easier to get it merged and then add additional parameters in separate pull requests.

Thanks for working on this! Sorry for the slowness in reviewing your PRs, they have been lower on my to-do list since we are at a feature pause until v0.4.1. I will take a look after the release.

@willschlitzer
Copy link
Contributor

Thanks for working on this! Sorry for the slowness in reviewing your PRs, they have been lower on my to-do list since we are at a feature pause until v0.4.1. I will take a look after the release.

No worries, I expected a v0.4.1, but looking forward to getting them wrapped up!

@willschlitzer willschlitzer marked this pull request as ready for review August 7, 2021 06:48
@willschlitzer willschlitzer requested a review from weiji14 August 8, 2021 06:29
weiji14
weiji14 approved these changes 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.

Just some formatting stuff, otherwise good for final review!

pygmt/src/xyz2grd.py Outdated Show resolved Hide resolved
pygmt/src/xyz2grd.py Outdated Show resolved Hide resolved
pygmt/src/xyz2grd.py Outdated Show resolved Hide resolved
pygmt/src/xyz2grd.py Outdated Show resolved Hide resolved
@weiji14 weiji14 added the final review call This PR requires final review and approval from a second reviewer label Aug 8, 2021
seisman
seisman approved these changes Aug 8, 2021
View reviewed changes
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 good to me.

weiji14
weiji14 reviewed Aug 8, 2021
View reviewed changes
pygmt/src/xyz2grd.py Outdated Show resolved Hide resolved
@willschlitzer willschlitzer merged commit 097c807 into GenericMappingTools:main Aug 9, 2021
@willschlitzer willschlitzer removed the final review call This PR requires final review and approval from a second reviewer label Aug 9, 2021
@willschlitzer willschlitzer mentioned this pull request Aug 9, 2021
Closed
This was referenced Oct 4, 2021
Merged
Merged
@weiji14 weiji14 mentioned this pull request Mar 12, 2022
Merged
6 tasks
sixy6e pushed a commit to sixy6e/pygmt that referenced this pull request Dec 21, 2022
@carocamargo @seisman
@weiji14 @willschlitzer @maxrjones
Wrap xyz2grd (GenericMappingTools#636)
3c9f03b 
*Wrap the GMT module xyz2grd
*Add tests for xyz2grd

Co-authored-by: Dongdong Tian <[email protected]>
Co-authored-by: Wei Ji <[email protected]>
Co-authored-by: Will Schlitzer <[email protected]>
Co-authored-by: Meghan Jones <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@willschlitzer willschlitzer willschlitzer left review comments

@weiji14 weiji14 weiji14 approved these changes

@seisman seisman seisman 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.

xyz2grd wrapper
5 participants
@carocamargo @weiji14 @seisman @willschlitzer @maxrjones