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

Revert plotting across dateline workarounds #585

Merged
merged 3 commits into from
Sep 5, 2020
Merged

Revert plotting across dateline workarounds #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9382c9f
Revert runfirst workaround for test_grdimage_over_dateline
weiji14 Aug 10, 2020
2dcea79
Revert grdtrack example workaround in #531 crashing due to bad meridian
weiji14 Sep 2, 2020
90b8770
Remove unneeded pytest mpl_image_compare and runfirst markers
weiji14 Sep 4, 2020
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
6 changes: 1 addition & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ test:
@echo ""
@cd $(TESTDIR); python -c "import $(PROJECT); $(PROJECT).show_versions()"
@echo ""
# There are two steps to the test here because `test_grdimage_over_dateline`
# passes only when it runs before the other tests.
# See also https://github.com/GenericMappingTools/pygmt/pull/476
cd $(TESTDIR); pytest -m runfirst $(PYTEST_ARGS) $(PROJECT)
cd $(TESTDIR); pytest -m 'not runfirst' $(PYTEST_ARGS) $(PROJECT)
cd $(TESTDIR); pytest $(PYTEST_ARGS) $(PROJECT)
cp $(TESTDIR)/coverage.xml .
cp -r $(TESTDIR)/htmlcov .
rm -r $(TESTDIR)
Expand Down
2 changes: 1 addition & 1 deletion examples/gallery/grid/track_sampling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

fig = pygmt.Figure()
# Plot the earth relief grid on Cylindrical Stereographic projection, masking land areas
fig.basemap(region="d", frame=True, projection="Cyl_stere/8i")
fig.basemap(region="g", frame=True, projection="Cyl_stere/150/-20/8i")
fig.grdimage(grid=grid, cmap="gray")
fig.coast(land="#666666")
# Plot using circles (c) of 0.15cm, the sampled bathymetry points
Expand Down
4 changes: 0 additions & 4 deletions pygmt/tests/test_grdimage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ def test_grdimage_fails():
fig.grdimage(np.arange(20).reshape((4, 5)))


# This test needs to run first before the other tests (on Linux at least) so
# that a black image isn't plotted due to an `inf` value when resampling.
# See also https://github.com/GenericMappingTools/pygmt/pull/476
@pytest.mark.runfirst
@pytest.mark.mpl_image_compare
def test_grdimage_over_dateline(xrgrid):
"""
Expand Down
5 changes: 0 additions & 5 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,3 @@ max-line-length = 88
max-doc-length = 79
exclude =
pygmt/_version.py

[tool:pytest]
markers =
mpl_image_compare: compare generated plots with correct baseline version
runfirst: runs the test(s) first before the other ones