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

Remove xfail from passing grdimage tests #1656

Merged
merged 9 commits into from
Jan 5, 2022
Merged

Remove xfail from passing grdimage tests #1656

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
275a3cf
Remove xfail from passing grdimage tests
maxrjones Dec 13, 2021
9d600a8
Remove tol from passing tests
maxrjones Dec 13, 2021
eb6a151
Merge branch 'main' into update-xfail
seisman Dec 17, 2021
1e16f6a
Remove tol from check_figures_equal in grdimage tests
maxrjones Dec 22, 2021
33dda30
Merge branch 'main' into update-xfail
maxrjones Dec 22, 2021
40c8032
Fix decorator
maxrjones Dec 22, 2021
06f6f12
Apply suggestions from code review
maxrjones Jan 3, 2022
8be04a4
Merge branch 'main' into update-xfail
maxrjones Jan 3, 2022
cfb0644
Merge branch 'main' into update-xfail
seisman Jan 5, 2022
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
17 changes: 11 additions & 6 deletions pygmt/tests/test_grdimage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@ def test_grdimage_shading_xarray(grid, shading):
return fig_ref, fig_test


@pytest.mark.xfail(
reason="Incorrect scaling of geo CPT on xarray.DataArray grdimage plot."
"See https://github.com/GenericMappingTools/gmt/issues/5294",
)
@check_figures_equal()
def test_grdimage_grid_and_shading_with_xarray(grid, xrgrid):
"""
Expand Down Expand Up @@ -208,8 +204,17 @@ def test_grdimage_central_meridians(grid, proj_type, lon0):
# TO-DO remove tol=1.5 and pytest.mark.xfail once bug is solved in upstream GMT
@check_figures_equal(tol=1.5)
@pytest.mark.parametrize("lat0", [0, 30])
@pytest.mark.parametrize("lon0", [0, 123, 180])
@pytest.mark.parametrize("proj_type", [pytest.param("Q", marks=pytest.mark.xfail), "S"])
@pytest.mark.parametrize(
("proj_type", "lon0"),
[
("Q", 0),
pytest.param("Q", 123, marks=pytest.mark.xfail),
pytest.param("Q", 180, marks=pytest.mark.xfail),
("S", 0),
("S", 123),
("S", 180),
],
)
def test_grdimage_central_meridians_and_standard_parallels(grid, proj_type, lon0, lat0):
"""
Test that plotting a grid with different central meridians (lon0) and
Expand Down