From de43e4726d2e879612cf44b1100d3927862e8756 Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:06:49 +1200
Subject: [PATCH 1/3] Update fig.grdcontour baseline images for GMT 6.2.0rc1

---
 pygmt/tests/baseline/test_grdcontour.png.dvc                  | 4 ++--
 pygmt/tests/baseline/test_grdcontour_file.png.dvc             | 4 ++--
 .../baseline/test_grdcontour_interval_file_full_opts.png.dvc  | 4 ++--
 pygmt/tests/baseline/test_grdcontour_labels.png.dvc           | 4 ++--
 pygmt/tests/baseline/test_grdcontour_slice.png.dvc            | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pygmt/tests/baseline/test_grdcontour.png.dvc b/pygmt/tests/baseline/test_grdcontour.png.dvc
index ec4d73fcf13..dea1f734b46 100644
--- a/pygmt/tests/baseline/test_grdcontour.png.dvc
+++ b/pygmt/tests/baseline/test_grdcontour.png.dvc
@@ -1,4 +1,4 @@
 outs:
-- md5: 438f13a0356e3bec8e3762180ea9c2f0
-  size: 219869
+- md5: 9366e405a1be22b4c2515f24a3acae69
+  size: 217638
   path: test_grdcontour.png
diff --git a/pygmt/tests/baseline/test_grdcontour_file.png.dvc b/pygmt/tests/baseline/test_grdcontour_file.png.dvc
index 67d535947a1..c044a33f0ac 100644
--- a/pygmt/tests/baseline/test_grdcontour_file.png.dvc
+++ b/pygmt/tests/baseline/test_grdcontour_file.png.dvc
@@ -1,4 +1,4 @@
 outs:
-- md5: fa2f0be00003b6a1cf8cc80da0eb824c
-  size: 102192
+- md5: 717b9f9123c7bb2bfb197a419d459288
+  size: 97067
   path: test_grdcontour_file.png
diff --git a/pygmt/tests/baseline/test_grdcontour_interval_file_full_opts.png.dvc b/pygmt/tests/baseline/test_grdcontour_interval_file_full_opts.png.dvc
index ee658bca1d6..f3e40cd1fe6 100644
--- a/pygmt/tests/baseline/test_grdcontour_interval_file_full_opts.png.dvc
+++ b/pygmt/tests/baseline/test_grdcontour_interval_file_full_opts.png.dvc
@@ -1,4 +1,4 @@
 outs:
-- md5: 7f655c17e068dd4860c5f97b7503a314
-  size: 38237
+- md5: 25125246f541652071fac1771e5d7e88
+  size: 33966
   path: test_grdcontour_interval_file_full_opts.png
diff --git a/pygmt/tests/baseline/test_grdcontour_labels.png.dvc b/pygmt/tests/baseline/test_grdcontour_labels.png.dvc
index e805c4ab3b6..c7cd373037d 100644
--- a/pygmt/tests/baseline/test_grdcontour_labels.png.dvc
+++ b/pygmt/tests/baseline/test_grdcontour_labels.png.dvc
@@ -1,4 +1,4 @@
 outs:
-- md5: 582303f039a43f271c543b78d3a3ff4b
-  size: 226135
+- md5: 03a7cc6dea35f9383cbfb2683d7b7c1b
+  size: 223421
   path: test_grdcontour_labels.png
diff --git a/pygmt/tests/baseline/test_grdcontour_slice.png.dvc b/pygmt/tests/baseline/test_grdcontour_slice.png.dvc
index c83a179e874..b28d837a160 100644
--- a/pygmt/tests/baseline/test_grdcontour_slice.png.dvc
+++ b/pygmt/tests/baseline/test_grdcontour_slice.png.dvc
@@ -1,4 +1,4 @@
 outs:
-- md5: c9538960aae7cd5263bce0f6bda20090
-  size: 102143
+- md5: 48070d23c538d26eb96b5caaf440513a
+  size: 97314
   path: test_grdcontour_slice.png

From 6a4a656876639a1e8b8d7f80f93ce5a106fdc2eb Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:15:29 +1200
Subject: [PATCH 2/3] Fix test_grdfilter tests for GMT 6.2.0rc1

Min/max values of the grid now matches properly for xarray.DataArray and NetCDF inputs.
---
 pygmt/tests/test_grdfilter.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pygmt/tests/test_grdfilter.py b/pygmt/tests/test_grdfilter.py
index bb064327223..129f90a8c7a 100644
--- a/pygmt/tests/test_grdfilter.py
+++ b/pygmt/tests/test_grdfilter.py
@@ -21,7 +21,7 @@ def fixture_grid():
     return load_earth_relief(registration="pixel")
 
 
-def test_grfilter_dataarray_in_dataarray_out(grid):
+def test_grdfilter_dataarray_in_dataarray_out(grid):
     """
     grdfilter an input DataArray, and output as DataArray.
     """
@@ -32,8 +32,8 @@ def test_grfilter_dataarray_in_dataarray_out(grid):
     assert result.coords["lat"].data.max() == 89.5
     assert result.coords["lon"].data.min() == -179.5
     assert result.coords["lon"].data.max() == 179.5
-    npt.assert_almost_equal(result.data.min(), -6147.47265625, decimal=2)
-    npt.assert_almost_equal(result.data.max(), 5164.1157, decimal=2)
+    npt.assert_almost_equal(result.data.min(), -6147.4907, decimal=2)
+    npt.assert_almost_equal(result.data.max(), 5164.06, decimal=2)
     assert result.sizes["lat"] == 180
     assert result.sizes["lon"] == 360
 
@@ -47,11 +47,11 @@ def test_grdfilter_dataarray_in_file_out(grid):
         assert result is None  # grdfilter returns None if output to a file
         result = grdinfo(tmpfile.name, per_column=True)
         assert (
-            result == "-180 180 -90 90 -6147.47265625 5164.11572266 1 1 360 180 1 1\n"
+            result == "-180 180 -90 90 -6147.49072266 5164.06005859 1 1 360 180 1 1\n"
         )
 
 
-def test_grfilter_file_in_dataarray_out():
+def test_grdfilter_file_in_dataarray_out():
     """
     grdfilter an input grid file, and output as DataArray.
     """

From c93cc992163e688ef5953210cc396e06967393bc Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:17:06 +1200
Subject: [PATCH 3/3] Update fig.grd2cpt baseline image for GMT 6.2.0rc1

---
 pygmt/tests/baseline/test_grd2cpt.png.dvc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pygmt/tests/baseline/test_grd2cpt.png.dvc b/pygmt/tests/baseline/test_grd2cpt.png.dvc
index 7e226749ada..f55edee9848 100644
--- a/pygmt/tests/baseline/test_grd2cpt.png.dvc
+++ b/pygmt/tests/baseline/test_grd2cpt.png.dvc
@@ -1,4 +1,4 @@
 outs:
-- md5: 0848349770986ef56d740e866ab961bc
-  size: 24843
+- md5: 305e3650aa4ed9a56bec58be3a0d752b
+  size: 22460
   path: test_grd2cpt.png