Merge branch 'pygmtlogo-parameterize' into pygmtlogo-font

Author: seisman

pygmt/tests/baseline/test_pygmtlogo_circle_design_vertical.png.dvc

@@ -2,4 +2,4 @@ outs:
 - md5: 44a9a200fbac4c868b69cb1c13e6dfc5
   size: 320394
   hash: md5
-  path: test_pygmtlogo_circle_design_horizontal.png
+  path: test_pygmtlogo_design_circle-horizontal.png

…gmtlogo_circle_design_horizontal.png.dvc …gmtlogo_design_circle-horizontal.png.dvcpygmt/tests/baseline/test_pygmtlogo_circle_design_horizontal.png.dvc renamed to pygmt/tests/baseline/test_pygmtlogo_design_circle-horizontal.png.dvc pygmt/tests/baseline/test_pygmtlogo_circle_design_horizontal.png.dvc renamed to pygmt/tests/baseline/test_pygmtlogo_design_circle-horizontal.png.dvc

@@ -0,0 +1,5 @@
+outs:
+- md5: 5ee82660f20bc8424f3051af4f9fb9ac
+  size: 173671
+  hash: md5
+  path: test_pygmtlogo_design_circle-vertical.png

pygmt/tests/baseline/test_pygmtlogo_design_circle-vertical.png.dvc

@@ -0,0 +1,5 @@
+outs:
+- md5: 9715eb13bec45201818d701970a529c8
+  size: 63949
+  hash: md5
+  path: test_pygmtlogo_wordmark_horizontal_circle.png

pygmt/tests/baseline/test_pygmtlogo_wordmark_horizontal_circle.png.dvc

@@ -2,4 +2,4 @@ outs:
 - md5: fdc90d2867bcbc096bcf5a9303d15ddf
   size: 31962
   hash: md5
-  path: test_pygmtlogo_circle_no_wordmark.png
+  path: test_pygmtlogo_wordmark_none_circle.png

…est_pygmtlogo_circle_no_wordmark.png.dvc …t_pygmtlogo_wordmark_none_circle.png.dvcpygmt/tests/baseline/test_pygmtlogo_circle_no_wordmark.png.dvc renamed to pygmt/tests/baseline/test_pygmtlogo_wordmark_none_circle.png.dvc pygmt/tests/baseline/test_pygmtlogo_circle_no_wordmark.png.dvc renamed to pygmt/tests/baseline/test_pygmtlogo_wordmark_none_circle.png.dvc

@@ -10,23 +10,25 @@
 
 @pytest.mark.mpl_image_compare(savefig_kwargs={"dpi": 600})
 @pytest.mark.parametrize("wordmark", ["horizontal", "vertical"])
-def test_pygmtlogo_circle_design(wordmark):
+@pytest.mark.parametrize("shape", ["circle"])
+def test_pygmtlogo_design(shape, wordmark):
     """
-    Test the design details of the PyGMT circular logo, with a wordmark.
+    Test the design details of the PyGMT logo with a wordmark.
 
     This is a regression test to ensure that the design of the logo does not change
     unintentionally. The debugging lines (gridlines and circles) are helpful for
     implementing the logo, but they are not included in the final logo design.
     """
-    fig = _create_logo(debug=True, wordmark=wordmark)
+    fig = _create_logo(debug=True, shape=shape, wordmark=wordmark)
     return fig
 
 
 @pytest.mark.mpl_image_compare
-def test_pygmtlogo_circle_no_wordmark():
+@pytest.mark.parametrize("shape", ["circle"])
+def test_pygmtlogo_wordmark_none(shape):
     """
-    Test the PyGMT circular logo without the wordmark, including both light/dark themes,
-    and colored/black-and-white versions.
+    Test the PyGMT logo without the wordmark, including both light/dark themes, and
+    colored/black-and-white versions.
     """
     fig = Figure()
     fig.basemap(
@@ -41,18 +43,20 @@ def test_pygmtlogo_circle_no_wordmark():
         ((3.5, 1.0), "dark", False),
     ]:
         fig.pygmtlogo(
-            position=Position((x, y), anchor="CM", cstype="mapcoords"),
+            position=Position((x, y), anchor="MC", cstype="mapcoords"),
             theme=theme,
             color=color,
+            shape=shape,
         )
     return fig
 
 
 @pytest.mark.mpl_image_compare
-def test_pygmtlogo_circle_horizontal_wordmark():
+@pytest.mark.parametrize("shape", ["circle"])
+def test_pygmtlogo_wordmark_horizontal(shape):
     """
-    Test the PyGMT circular logo with a horizontal wordmark, including both light/dark
-    themes, and colored/black-and-white versions.
+    Test the PyGMT logo with a horizontal wordmark, including both light/dark themes,
+    and colored/black-and-white versions.
     """
     fig = Figure()
     fig.basemap(
@@ -70,6 +74,7 @@ def test_pygmtlogo_circle_horizontal_wordmark():
             position=Position((x, y), anchor="ML", cstype="mapcoords"),
             theme=theme,
             color=color,
+            shape=shape,
             wordmark="horizontal",
         )
     return fig