Skip to content

Wrap grdinfo aliases - #799

Merged
willschlitzer merged 49 commits into
GenericMappingTools:masterfrom
willschlitzer:grdinfo-alias
Feb 7, 2021
Merged

Wrap grdinfo aliases#799
willschlitzer merged 49 commits into
GenericMappingTools:masterfrom
willschlitzer:grdinfo-alias

Conversation

@willschlitzer

@willschlitzerwillschlitzer commented Jan 21, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

Wrapping the R, C, D, F, I, L, T, and M aliases for grdinfo. This is the first part of improving grdinfo, as mentioned in #593 , and once this is done I intend to create an argument to return a dictionary of the grdinfo values.

Ref GMT.jl at https://www.generic-mapping-tools.org/GMT.jl/v0.28/#GMT.grdinfo

Documentation preview is at https://pygmt-git-fork-willschlitzer-grdinfo-alias.gmt.vercel.app/api/generated/pygmt.grdinfo.html#pygmt.grdinfo

@willschlitzer
Add cyl_transverse_mercator.py
27f5d20
@willschlitzer
Add cyl_universal_transverse_mercator.py
d64983f
@willschlitzer
Changing land color to red in cyl_mercator.py to match GMT docs examp…
6ba8185
…le; changing units from US to SI
@willschlitzer
Merge branch 'master' into cylindrical-projections
76850ee
@willschlitzer
Merge branch 'master' ofhttps://github.com/GenericMappingTools/pygmt
48431db
# Conflicts:
#	examples/projections/cyl/cyl_transverse_mercator.py
#	examples/projections/cyl/cyl_universal_transverse_mercator.py
@willschlitzer
Merge branch 'master' ofhttps://github.com/GenericMappingTools/pygmt
01052d2
@willschlitzer
Merge remote-tracking branch 'origin/master'
c710988
@willschlitzer
Merge branch 'master' ofhttps://github.com/GenericMappingTools/pygmt
b94e0a2
@willschlitzer
Add region alias to grdinfo
1466bb9
@willschlitzer
Add grid argument name to existing tests
158ef5d
@willschlitzer
Add tab, geographic, and zdata aliases
a90ca99
@willschlitzer
Add tab doc string
cac7aff
@willschlitzer
Add tab doc string
73e0af7
weiji14
weiji14 reviewed Jan 21, 2021
View reviewed changes
Comment threadpygmt/modules.py Outdated
@weiji14weiji14 added the documentation Improvements or additions to documentation label Jan 21, 2021
@willschlitzer

willschlitzer commented Feb 6, 2021

Copy link
Copy Markdown
ContributorAuthor

@seisman I think I have taken care of all of your recommended changes

weiji14
weiji14 reviewed Feb 6, 2021
View reviewed changes

@weiji14weiji14 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just some more minor suggestions :)

Comment threadpygmt/modules.py Outdated
Comment threadpygmt/src/grdinfo.py
Comment threadpygmt/src/grdinfo.py Outdated
@willschlitzer@weiji14
Update pygmt/src/grdinfo.py
0d31d52
Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
weiji14
weiji14 approved these changes Feb 6, 2021
View reviewed changes

@weiji14weiji14 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

One more tick off the list 😄

seisman
seisman reviewed Feb 6, 2021
View reviewed changes
Comment threadpygmt/src/grdinfo.py Outdated
@weiji14@seisman
Update pygmt/src/grdinfo.py
994e7da
Co-authored-by: Dongdong Tian <seisman.info@gmail.com>
@weiji14

weiji14 commented Feb 6, 2021

Copy link
Copy Markdown
Member

@willschlitzer, could you squash and merge this yourself? Remember to summarize the commit message!

@willschlitzer

willschlitzer commented Feb 7, 2021

Copy link
Copy Markdown
ContributorAuthor

@GenericMappingTools/python It looks like this keeps failing Windows tests (but not the same tests). Is there a particular method we use to squash and merge, or should I just follow the command line instructions that GitHub recommends?

@weiji14

weiji14 commented Feb 7, 2021

Copy link
Copy Markdown
Member

@GenericMappingTools/python It looks like this keeps failing Windows tests (but not the same tests).

It's ok to ignore the random Windows test failures (we've been trying unsuccessfully to debug and fix it for a while now, see #758).

Is there a particular method we use to squash and merge, or should I just follow the command line instructions that GitHub recommends?

Just use the Github UI (i.e. click the 'squash and merge' button). Do not use the command line instructions as it does a slightly different thing. I'll disable the required Windows checks so you can merge (after resolving the conflict on pygmt/src/__init__.py).

@weiji14

weiji14 commented Feb 7, 2021

Copy link
Copy Markdown
Member

/format

@willschlitzer
willschlitzer merged commit 073a83a into GenericMappingTools:masterFeb 7, 2021
@willschlitzer
willschlitzer deleted the grdinfo-alias branch February 7, 2021 14:12
@weiji14weiji14 mentioned this pull request Feb 13, 2021
Closed
sixy6e pushed a commit to sixy6e/pygmt that referenced this pull request Dec 21, 2022
@willschlitzer@seisman
@actions-bot@weiji14Josh Sixsmith
Wrap grdinfo aliases (GenericMappingTools#799)
9b5506c
*Wrap grdinfo R, C, D, F, I, L, T, and M aliases
*Move grdinfo function to grdinfo.py
Co-authored-by: Dongdong Tian <seisman.info@gmail.com>
Co-authored-by: actions-bot <58130806+actions-bot@users.noreply.github.com>
Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@seismanseismanseisman approved these changes
@weiji14weiji14weiji14 approved these changes

Assignees

No one assigned

Labels

documentationImprovements or additions to documentation

Projects

None yet

Milestone

0.3.0

Development

Successfully merging this pull request may close these issues.

4 participants

@willschlitzer@seisman@weiji14@actions-bot