Skip to content

pygmt.grdproject: Raise an exception when both 'unit' and 'scaling' are given #4371

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

Merged
seisman merged 7 commits into from
Jan 29, 2026
Merged

pygmt.grdproject: Raise an exception when both 'unit' and 'scaling' are given #4371

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9484d4
Add input validation and associated testing for 'unit' and 'scaling.'
willschlitzer Jan 16, 2026
24fba7b
Add input validation and an associated test for unit and scaling to g…
willschlitzer Jan 27, 2026
62b619b
Update pygmt/src/grdproject.py
willschlitzer Jan 27, 2026
6f4e790
Update pygmt/src/grdproject.py
willschlitzer Jan 28, 2026
a4eb3b0
Update pygmt/tests/test_grdproject.py
willschlitzer Jan 28, 2026
f207623
Merge branch 'main' into grdproject-scaling-test
willschlitzer Jan 28, 2026
c2dfb26
Improve docstring for test_grdproject_unit_scaling()
willschlitzer Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pygmt/src/grdproject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ def grdproject( # noqa: PLR0913
msg = "Parameter 'projection' must be specified."
raise GMTInvalidInput(msg)

if kwargs.get("M") and kwargs.get("F"):
Comment thread
willschlitzer marked this conversation as resolved.
Outdated
msg = "Cannot use both 'unit' and 'scaling;."
Comment thread
willschlitzer marked this conversation as resolved.
Outdated
raise GMTInvalidInput(msg)

aliasdict = AliasSystem(
C=Alias(center, name="center", sep="/", size=2),
D=Alias(spacing, name="spacing", sep="/", size=2),
Expand Down
14 changes: 14 additions & 0 deletions pygmt/tests/test_grdproject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,20 @@ def test_grdproject_no_outgrid(grid, projection, expected_grid):
xr.testing.assert_allclose(a=result, b=expected_grid)


def test_grdproject_unit_scaling(grid):
"""
Test that the validation for passing boht 'unit' and 'scaling' is performed.
"""
with pytest.raises(GMTInvalidInput):
grdproject(
grid=grid,
projection="M10c",
spacing=3,
unit="i",
Comment thread
willschlitzer marked this conversation as resolved.
region=[-53, -51, -20, -17],
)


def test_grdproject_fails(grid):
"""
Check that grdproject fails correctly.
Expand Down
Loading