Skip to content

Commit 960cd0e

Browse files
authored
Revert plotting across dateline workarounds (#585)
Remove workarounds added because plotting grids across the dateline would crash, not needed since bumping minimum required GMT version to 6.1.1. * Revert runfirst workaround for test_grdimage_over_dateline * Revert grdtrack example workaround in #531 crashing due to bad meridian * Remove unneeded pytest mpl_image_compare and runfirst markers
1 parent 526e38b commit 960cd0e

File tree

4 files changed

+2
-15
lines changed

4 files changed

+2
-15
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ test:
2929
@echo ""
3030
@cd $(TESTDIR); python -c "import $(PROJECT); $(PROJECT).show_versions()"
3131
@echo ""
32-
# There are two steps to the test here because `test_grdimage_over_dateline`
33-
# passes only when it runs before the other tests.
34-
# See also https://github.com/GenericMappingTools/pygmt/pull/476
35-
cd $(TESTDIR); pytest -m runfirst $(PYTEST_ARGS) $(PROJECT)
36-
cd $(TESTDIR); pytest -m 'not runfirst' $(PYTEST_ARGS) $(PROJECT)
32+
cd $(TESTDIR); pytest $(PYTEST_ARGS) $(PROJECT)
3733
cp $(TESTDIR)/coverage.xml .
3834
cp -r $(TESTDIR)/htmlcov .
3935
rm -r $(TESTDIR)

examples/gallery/grid/track_sampling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
fig = pygmt.Figure()
2626
# Plot the earth relief grid on Cylindrical Stereographic projection, masking land areas
27-
fig.basemap(region="d", frame=True, projection="Cyl_stere/8i")
27+
fig.basemap(region="g", frame=True, projection="Cyl_stere/150/-20/8i")
2828
fig.grdimage(grid=grid, cmap="gray")
2929
fig.coast(land="#666666")
3030
# Plot using circles (c) of 0.15cm, the sampled bathymetry points

pygmt/tests/test_grdimage.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ def test_grdimage_fails():
7676
fig.grdimage(np.arange(20).reshape((4, 5)))
7777

7878

79-
# This test needs to run first before the other tests (on Linux at least) so
80-
# that a black image isn't plotted due to an `inf` value when resampling.
81-
# See also https://github.com/GenericMappingTools/pygmt/pull/476
82-
@pytest.mark.runfirst
8379
@pytest.mark.mpl_image_compare
8480
def test_grdimage_over_dateline(xrgrid):
8581
"""

setup.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,3 @@ max-line-length = 88
1212
max-doc-length = 79
1313
exclude =
1414
pygmt/_version.py
15-
16-
[tool:pytest]
17-
markers =
18-
mpl_image_compare: compare generated plots with correct baseline version
19-
runfirst: runs the test(s) first before the other ones

0 commit comments

Comments
 (0)