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.

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 baseline images for basemap #1221

Merged
merged 4 commits into from
Apr 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/dvc-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ jobs:
echo -e "### Modified images\n" >> report.md
# Upload new images
while IFS= read -r line; do
cml-publish --title $line --md "$line" > modified_images_new.md < /dev/null
cml-publish --title $line --md "$line" >> modified_images_new.md < /dev/null
done < modified_files.txt

# Pull images in the master branch from cloud storage
git checkout master
dvc pull --remote upstream
# Upload old images
while IFS= read -r line; do
cml-publish --title $line --md "$line" > modified_images_old.md < /dev/null
cml-publish --title $line --md "$line" >> modified_images_old.md < /dev/null
done < modified_files.txt

# Append image report for modified images
Expand Down
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_basemap.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 61986bbf1ea20c418cbce50456d1d4f7
size: 9281
- md5: 3cf01816fa5dd3fbc1adc602557bb032
size: 6187
path: test_basemap.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_basemap_compass.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 5ecccc4123b28636b62e01f642006ae4
size: 90778
- md5: 77dc6e9b11b2fa1cf79c7de525704fca
size: 76593
path: test_basemap_compass.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_basemap_loglog.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 04df0757105b810a647f545f4f7371fb
size: 28235
- md5: 37c36d4fa4524260ea43c6757a3140a1
size: 24475
path: test_basemap_loglog.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_basemap_map_scale.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: f1ff6ede343ce3d2fc42cbe9ef0ba96b
size: 40128
- md5: e88925c5053369eb516757ec963d691d
size: 31044
path: test_basemap_map_scale.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_basemap_power_axis.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 6d9dd0086ab8226f180c6aae5ec3e4a6
size: 31288
- md5: d42769c9b2a802788ac3b3fd0c193c26
size: 16446
path: test_basemap_power_axis.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_basemap_rose.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: ede2912205feff80db261b54ff8d5bec
size: 41421
- md5: 50267f9329529a279a1846185b78f0ef
size: 32476
path: test_basemap_rose.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_basemap_winkel_tripel.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: d0d2c680e9e6e1b546566d9aa2aaf830
size: 70487
- md5: b32f987475dee83c219df916a7ffb687
size: 62786
path: test_basemap_winkel_tripel.png
10 changes: 9 additions & 1 deletion pygmt/tests/test_basemap.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
Tests Figure.basemap.
"""
import pytest
from pygmt import Figure
from packaging.version import Version
from pygmt import Figure, clib
from pygmt.exceptions import GMTInvalidInput

with clib.Session() as _lib:
gmt_version = Version(_lib.info["version"])


def test_basemap_required_args():
"""
Expand Down Expand Up @@ -53,6 +57,10 @@ def test_basemap_power_axis():
return fig


@pytest.mark.xfail(
condition=gmt_version == Version("6.2.0rc1"),
reason="Upstream bug #5167 in GMT 6.2.0rc1",
)
@pytest.mark.mpl_image_compare
def test_basemap_polar():
"""
Expand Down