Skip to content

Commit dbca95d

Browse files
committed
Migrate test_grdview baseline images to dvc
Related to #1131, and is almost like reverting #589.
1 parent ebdb353 commit dbca95d

31 files changed

+138
-96
lines changed
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 39c4525a8063626b849ca8a563727e83
3+
size: 112093
4+
path: test_grdview_drapegrid_dataarray.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 5a7f352480ac99e44ee4efa8eb53b2ef
3+
size: 13701
4+
path: test_grdview_grid_dataarray.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 5a7f352480ac99e44ee4efa8eb53b2ef
3+
size: 13701
4+
path: test_grdview_grid_file_with_region_subset.png
-95.7 KB
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 8b086d1f7975bf77a7315224e09a5f79
3+
size: 58457
4+
path: test_grdview_on_a_plane.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: a6777cda1e46f64924d12e135b6ed1a4
3+
size: 59231
4+
path: test_grdview_on_a_plane_styled_with_facadepen.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 0414154cc61fa8fb1fa776cd7861ee67
3+
size: 59565
4+
path: test_grdview_on_a_plane_with_colored_frontal_facade.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 924f81a58ce4eccb3aec1425e2b9be02
3+
size: 83463
4+
path: test_grdview_surface_mesh_plot_styled_with_meshpen.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 38bbc59894b35f0c22d155d9f5899757
3+
size: 99305
4+
path: test_grdview_surface_plot_styled_with_contourpen.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 6d26a10ccf44243fbaa90a123f91ef6a
3+
size: 117604
4+
path: test_grdview_with_cmap_for_image_plot.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 65f3a4ae440be86b5e79b9280c23f54f
3+
size: 164399
4+
path: test_grdview_with_cmap_for_perspective_surface_plot.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 9dde4851629f9259c95b7b37d3a5ff73
3+
size: 153867
4+
path: test_grdview_with_cmap_for_surface_monochrome_plot.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 279dc98a95d468dee51752724e85ca18
3+
size: 22964
4+
path: test_grdview_with_perspective.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 96b307bcf6eb3aa724c6d5c3c958fbb1
3+
size: 242570
4+
path: test_grdview_with_perspective_and_zaxis_frame.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: 7551ede00a17a7b9c6aa7475314e9158
3+
size: 48126
4+
path: test_grdview_with_perspective_and_zscale.png
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
outs:
2+
- md5: ce1c9331d576edd50f4f50bba296fa9e
3+
size: 57243
4+
path: test_grdview_with_perspective_and_zsize.png

pygmt/tests/test_grdview.py

+78-96
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@ def fixture_xrgrid(region):
3434
return grdcut(grid="@earth_relief_01d_g", region=region)
3535

3636

37-
@check_figures_equal()
38-
def test_grdview_grid_dataarray(gridfile, xrgrid):
37+
@pytest.mark.mpl_image_compare
38+
def test_grdview_grid_dataarray(xrgrid):
3939
"""
4040
Run grdview by passing in a grid as an xarray.DataArray.
4141
"""
42-
fig_ref, fig_test = Figure(), Figure()
43-
fig_ref.grdview(grid=gridfile)
44-
fig_test.grdview(grid=xrgrid)
45-
return fig_ref, fig_test
42+
fig = Figure()
43+
fig.grdview(grid=xrgrid)
44+
return fig
4645

4746

4847
@pytest.mark.mpl_image_compare
@@ -69,184 +68,167 @@ def test_grdview_wrong_kind_of_grid(xrgrid):
6968
fig.grdview(grid=dataset)
7069

7170

72-
@check_figures_equal()
73-
def test_grdview_with_perspective(gridfile, xrgrid):
71+
@pytest.mark.mpl_image_compare
72+
def test_grdview_with_perspective(gridfile):
7473
"""
7574
Run grdview by passing in a grid and setting a perspective viewpoint with
7675
an azimuth from the SouthEast and an elevation angle 15 degrees from the
7776
z-plane.
7877
"""
79-
fig_ref, fig_test = Figure(), Figure()
80-
fig_ref.grdview(grid=gridfile, perspective=[135, 15])
81-
fig_test.grdview(grid=xrgrid, perspective=[135, 15])
82-
return fig_ref, fig_test
78+
fig = Figure()
79+
fig.grdview(grid=gridfile, perspective=[135, 15])
80+
return fig
8381

8482

85-
@check_figures_equal()
86-
def test_grdview_with_perspective_and_zscale(gridfile, xrgrid):
83+
@pytest.mark.mpl_image_compare
84+
def test_grdview_with_perspective_and_zscale(xrgrid):
8785
"""
8886
Run grdview by passing in a grid and setting a perspective viewpoint with
8987
an azimuth from the SouthWest and an elevation angle 30 degrees from the
9088
z-plane, plus a z-axis scaling factor of 0.005.
9189
"""
92-
fig_ref, fig_test = Figure(), Figure()
93-
kwargs = dict(perspective=[225, 30], zscale=0.005)
94-
fig_ref.grdview(grid=gridfile, **kwargs)
95-
fig_test.grdview(grid=xrgrid, **kwargs)
96-
return fig_ref, fig_test
90+
fig = Figure()
91+
fig.grdview(grid=xrgrid, perspective=[225, 30], zscale=0.005)
92+
return fig
9793

9894

99-
@check_figures_equal()
100-
def test_grdview_with_perspective_and_zsize(gridfile, xrgrid):
95+
@pytest.mark.mpl_image_compare
96+
def test_grdview_with_perspective_and_zsize(xrgrid):
10197
"""
10298
Run grdview by passing in a grid and setting a perspective viewpoint with
10399
an azimuth from the SouthWest and an elevation angle 30 degrees from the
104100
z-plane, plus a z-axis size of 10cm.
105101
"""
106-
fig_ref, fig_test = Figure(), Figure()
107-
kwargs = dict(perspective=[225, 30], zsize="10c")
108-
fig_ref.grdview(grid=gridfile, **kwargs)
109-
fig_test.grdview(grid=xrgrid, **kwargs)
110-
return fig_ref, fig_test
102+
fig = Figure()
103+
fig.grdview(grid=xrgrid, perspective=[225, 30], zsize="10c")
104+
return fig
111105

112106

113-
@check_figures_equal()
114-
def test_grdview_with_cmap_for_image_plot(gridfile, xrgrid):
107+
@pytest.mark.mpl_image_compare
108+
def test_grdview_with_cmap_for_image_plot(xrgrid):
115109
"""
116110
Run grdview by passing in a grid and setting a colormap for producing an
117111
image plot.
118112
"""
119-
fig_ref, fig_test = Figure(), Figure()
120-
kwargs = dict(cmap="oleron", surftype="i")
121-
fig_ref.grdview(grid=gridfile, **kwargs)
122-
fig_test.grdview(grid=xrgrid, **kwargs)
123-
return fig_ref, fig_test
113+
fig = Figure()
114+
fig.grdview(grid=xrgrid, cmap="oleron", surftype="i")
115+
return fig
124116

125117

126-
@check_figures_equal()
127-
def test_grdview_with_cmap_for_surface_monochrome_plot(gridfile, xrgrid):
118+
@pytest.mark.mpl_image_compare
119+
def test_grdview_with_cmap_for_surface_monochrome_plot(xrgrid):
128120
"""
129121
Run grdview by passing in a grid and setting a colormap for producing a
130122
surface monochrome plot.
131123
"""
132-
fig_ref, fig_test = Figure(), Figure()
133-
kwargs = dict(cmap="oleron", surftype="s+m")
134-
fig_ref.grdview(grid=gridfile, **kwargs)
135-
fig_test.grdview(grid=xrgrid, **kwargs)
136-
return fig_ref, fig_test
124+
fig = Figure()
125+
fig.grdview(grid=xrgrid, cmap="oleron", surftype="s+m")
126+
return fig
137127

138128

139-
@check_figures_equal()
140-
def test_grdview_with_cmap_for_perspective_surface_plot(gridfile, xrgrid):
129+
@pytest.mark.mpl_image_compare
130+
def test_grdview_with_cmap_for_perspective_surface_plot(xrgrid):
141131
"""
142132
Run grdview by passing in a grid and setting a colormap for producing a
143133
surface plot with a 3D perspective viewpoint.
144134
"""
145-
fig_ref, fig_test = Figure(), Figure()
146-
kwargs = dict(cmap="oleron", surftype="s", perspective=[225, 30], zscale=0.005)
147-
fig_ref.grdview(grid=gridfile, **kwargs)
148-
fig_test.grdview(grid=xrgrid, **kwargs)
149-
return fig_ref, fig_test
135+
fig = Figure()
136+
fig.grdview(
137+
grid=xrgrid, cmap="oleron", surftype="s", perspective=[225, 30], zscale=0.005
138+
)
139+
return fig
150140

151141

152-
@check_figures_equal()
153-
def test_grdview_on_a_plane(gridfile, xrgrid):
142+
@pytest.mark.mpl_image_compare
143+
def test_grdview_on_a_plane(xrgrid):
154144
"""
155145
Run grdview by passing in a grid and plotting it on a z-plane, while
156146
setting a 3D perspective viewpoint.
157147
"""
158-
fig_ref, fig_test = Figure(), Figure()
159-
kwargs = dict(plane=-4000, perspective=[225, 30], zscale=0.005)
160-
fig_ref.grdview(grid=gridfile, **kwargs)
161-
fig_test.grdview(grid=xrgrid, **kwargs)
162-
return fig_ref, fig_test
148+
fig = Figure()
149+
fig.grdview(grid=xrgrid, plane=-4000, perspective=[225, 30], zscale=0.005)
150+
return fig
163151

164152

165-
@check_figures_equal()
166-
def test_grdview_on_a_plane_with_colored_frontal_facade(gridfile, xrgrid):
153+
@pytest.mark.mpl_image_compare
154+
def test_grdview_on_a_plane_with_colored_frontal_facade(xrgrid):
167155
"""
168156
Run grdview by passing in a grid and plotting it on a z-plane whose frontal
169157
facade is colored gray, while setting a 3D perspective viewpoint.
170158
"""
171-
fig_ref, fig_test = Figure(), Figure()
172-
kwargs = dict(plane="-4000+ggray", perspective=[225, 30], zscale=0.005)
173-
fig_ref.grdview(grid=gridfile, **kwargs)
174-
fig_test.grdview(grid=xrgrid, **kwargs)
175-
return fig_ref, fig_test
159+
fig = Figure()
160+
fig.grdview(grid=xrgrid, plane="-4000+ggray", perspective=[225, 30], zscale=0.005)
161+
return fig
176162

177163

178-
@check_figures_equal()
179-
def test_grdview_with_perspective_and_zaxis_frame(gridfile, xrgrid, region):
164+
@pytest.mark.mpl_image_compare
165+
def test_grdview_with_perspective_and_zaxis_frame(xrgrid, region):
180166
"""
181167
Run grdview by passing in a grid and plotting an annotated vertical z-axis
182168
frame on a Transverse Mercator (T) projection.
183169
"""
184-
fig_ref, fig_test = Figure(), Figure()
170+
fig = Figure()
185171
projection = f"T{(region[0]+region[1])/2}/{abs((region[2]+region[3])/2)}"
186-
kwargs = dict(
172+
fig.grdview(
173+
grid=xrgrid,
187174
projection=projection,
188175
perspective=[225, 30],
189176
zscale=0.005,
190177
frame=["xaf", "yaf", "zaf"],
191178
)
192-
fig_ref.grdview(grid=gridfile, **kwargs)
193-
fig_test.grdview(grid=xrgrid, **kwargs)
194-
return fig_ref, fig_test
179+
return fig
195180

196181

197-
@check_figures_equal()
198-
def test_grdview_surface_plot_styled_with_contourpen(gridfile, xrgrid):
182+
@pytest.mark.mpl_image_compare
183+
def test_grdview_surface_plot_styled_with_contourpen(xrgrid):
199184
"""
200185
Run grdview by passing in a grid with styled contour lines plotted on top
201186
of a surface plot.
202187
"""
203-
fig_ref, fig_test = Figure(), Figure()
204-
kwargs = dict(cmap="relief", surftype="s", contourpen="0.5p,black,dash")
205-
fig_ref.grdview(grid=gridfile, **kwargs)
206-
fig_test.grdview(grid=xrgrid, **kwargs)
207-
return fig_ref, fig_test
188+
fig = Figure()
189+
fig.grdview(grid=xrgrid, cmap="relief", surftype="s", contourpen="0.5p,black,dash")
190+
return fig
208191

209192

210-
@check_figures_equal()
211-
def test_grdview_surface_mesh_plot_styled_with_meshpen(gridfile, xrgrid):
193+
@pytest.mark.mpl_image_compare
194+
def test_grdview_surface_mesh_plot_styled_with_meshpen(xrgrid):
212195
"""
213196
Run grdview by passing in a grid with styled mesh lines plotted on top of a
214197
surface mesh plot.
215198
"""
216-
fig_ref, fig_test = Figure(), Figure()
217-
kwargs = dict(cmap="relief", surftype="sm", meshpen="0.5p,black,dash")
218-
fig_ref.grdview(grid=gridfile, **kwargs)
219-
fig_test.grdview(grid=xrgrid, **kwargs)
220-
return fig_ref, fig_test
199+
fig = Figure()
200+
fig.grdview(grid=xrgrid, cmap="relief", surftype="sm", meshpen="0.5p,black,dash")
201+
return fig
221202

222203

223-
@check_figures_equal()
224-
def test_grdview_on_a_plane_styled_with_facadepen(gridfile, xrgrid):
204+
@pytest.mark.mpl_image_compare
205+
def test_grdview_on_a_plane_styled_with_facadepen(xrgrid):
225206
"""
226207
Run grdview by passing in a grid and plotting it on a z-plane with styled
227208
lines for the frontal facade.
228209
"""
229-
fig_ref, fig_test = Figure(), Figure()
230-
kwargs = dict(
231-
plane=-4000, perspective=[225, 30], zscale=0.005, facadepen="0.5p,blue,dash"
210+
fig = Figure()
211+
fig.grdview(
212+
grid=xrgrid,
213+
plane=-4000,
214+
perspective=[225, 30],
215+
zscale=0.005,
216+
facadepen="0.5p,blue,dash",
232217
)
233-
fig_ref.grdview(grid=gridfile, **kwargs)
234-
fig_test.grdview(grid=xrgrid, **kwargs)
235-
return fig_ref, fig_test
218+
return fig
236219

237220

238-
@check_figures_equal()
239-
def test_grdview_drapegrid_dataarray(gridfile, xrgrid):
221+
@pytest.mark.mpl_image_compare
222+
def test_grdview_drapegrid_dataarray(xrgrid):
240223
"""
241224
Run grdview by passing in both a grid and drapegrid as an xarray.DataArray,
242225
setting a colormap for producing an image plot.
243226
"""
244227
drapegrid = 1.1 * xrgrid
245228

246-
fig_ref, fig_test = Figure(), Figure()
247-
fig_ref.grdview(grid=gridfile, drapegrid=drapegrid, cmap="oleron", surftype="c")
248-
fig_test.grdview(grid=xrgrid, drapegrid=drapegrid, cmap="oleron", surftype="c")
249-
return fig_ref, fig_test
229+
fig = Figure()
230+
fig.grdview(grid=xrgrid, drapegrid=drapegrid, cmap="oleron", surftype="c")
231+
return fig
250232

251233

252234
def test_grdview_wrong_kind_of_drapegrid(xrgrid):

0 commit comments

Comments
 (0)