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

Update colorbar, inset, legend and logo baseline images for GMT 6.2.0 #1322

Merged
merged 3 commits into from
Jun 6, 2021
Merged

Update colorbar, inset, legend and logo baseline images for GMT 6.2.0 #1322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ddda56
Update colorbar, inset, legend, logo, plot3d baseline images for GMT …
weiji14 Jun 6, 2021
5840722
Merge branch 'master' into gmt-6.2.0/fix-tests
weiji14 Jun 6, 2021
3270134
Mark test_plot3d_matrix_color as xfail on Windows
weiji14 Jun 6, 2021
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: 2 additions & 2 deletions pygmt/tests/baseline/test_colorbar_box.png.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 5bd7bba7139b23c1c63dd7ed053a5b88
size: 1388
- md5: 554a83b4f34c4470e2e2aba765860e84
size: 1450
path: test_colorbar_box.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_inset_aliases.png.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 62d6aec510780889e6f1d25a8c564ff0
size: 29626
- md5: e70a202d0e548835276809936db1db98
size: 29870
path: test_inset_aliases.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_inset_context_manager.png.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 43c2c1d0c58d4fd2b24d3ca059cc5e35
size: 10477
- md5: 5748eda7fde2e3ee4dbe3ff94d82ba7f
size: 10486
path: test_inset_context_manager.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_legend_position.png.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 4306da978112fb27dde184d63ec440ee
size: 24826
- md5: 84d9a3ca57ed3a1e4aa826d05d20518c
size: 24875
path: test_legend_position.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_logo_on_a_map.png.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 57c3747cb7d2ed978e473d0f161ca3a6
size: 70993
- md5: 2c9c6a32042a171e4fa34df5f8eccdf4
size: 70884
path: test_logo_on_a_map.png
2 changes: 1 addition & 1 deletion pygmt/tests/baseline/test_plot3d_matrix_color.png.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 9b1e94da314923794dca11d20ae3e5df
- md5: d08eaf4bf196c8680a3b7c0d8f4259a7
size: 24071
Copy link
Member Author

@weiji14 weiji14 Jun 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test_plot3d_matrix_color still failing on Windows. See https://github.com/GenericMappingTools/pygmt/pull/1322/checks?check_run_id=2756778343#step:11:486:

__________________________ test_plot3d_matrix_color ___________________________
Error: Image dimensions did not match.
  Expected shape: (1040, 1729)
    D:\a\pygmt\pygmt\tmp-test-dir-with-unique-name\results\pygmt.tests.test_plot3d.test_plot3d_matrix_color\baseline.png
  Actual shape: (991, 1729)
    D:\a\pygmt\pygmt\tmp-test-dir-with-unique-name\results\pygmt.tests.test_plot3d.test_plot3d_matrix_color\result.png
baseline (correct) result (wrong)
baseline result

This test is using i=[0, 1, 2, 2], so perhaps something not handled properly with the bugfixes at GenericMappingTools/gmt#5289 or GenericMappingTools/gmt#5291?

pygmt/pygmt/tests/test_plot3d.py

Lines 375 to 392 in 638adab

@pytest.mark.mpl_image_compare
def test_plot3d_matrix_color(data, region):
"""
Plot the data passing in a matrix and using a colormap.
"""
fig = Figure()
fig.plot3d(
data=data,
zscale=5,
perspective=[225, 30],
region=region,
projection="X10c",
style="c0.5c",
cmap="rainbow",
columns=[0, 1, 2, 2],
frame=["a", "za"],
)
return fig

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it passes on Linux and macOS. I think we can mark it as xfail on Windows, and see if @joa-quim can help debug the Windows-only issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've marked test_plot3d_matrix_color as xfail on Windows (and reverted the dvc baseline image change to that test) at 3270134.

path: test_plot3d_matrix_color.png