Merge branch 'main' into to_numpy/pandas_numeric

Author: seisman

pygmt/tests/baseline/test_figure_shift_origin.png.dvc

@@ -0,0 +1,5 @@
+outs:
+- md5: 39b241fdd879271cf1e8cf1f73454706
+  size: 9910
+  hash: md5
+  path: test_shift_origin.png

pygmt/tests/baseline/test_shift_origin.png.dvc

@@ -2,10 +2,13 @@
 Tests for the _to_numpy function in the clib.conversion module.
 """
 
+import sys
+
 import numpy as np
 import numpy.testing as npt
 import pandas as pd
 import pytest
+from packaging.version import Version
 from pygmt.clib.conversion import _to_numpy
 
 
@@ -25,7 +28,13 @@ def _check_result(result, expected_dtype):
 @pytest.mark.parametrize(
     ("data", "expected_dtype"),
     [
-        pytest.param([1, 2, 3], np.int64, id="int"),
+        pytest.param(
+            [1, 2, 3],
+            np.int32
+            if sys.platform == "win32" and Version(np.__version__) < Version("2.0")
+            else np.int64,
+            id="int",
+        ),
         pytest.param([1.0, 2.0, 3.0], np.float64, id="float"),
         pytest.param(
             [complex(+1), complex(-2j), complex("-Infinity+NaNj")],

pygmt/tests/test_clib_to_numpy.py

@@ -292,26 +292,6 @@ def test_figure_show():
     fig.show()
 
 
-@pytest.mark.mpl_image_compare
-def test_figure_shift_origin():
-    """
-    Test if fig.shift_origin works.
-    """
-    kwargs = {"region": [0, 3, 0, 5], "projection": "X3c/5c", "frame": 0}
-    fig = Figure()
-    # First call shift_origin without projection and region.
-    # Test issue https://github.com/GenericMappingTools/pygmt/issues/514
-    fig.shift_origin(xshift="2c", yshift="3c")
-    fig.basemap(**kwargs)
-    fig.shift_origin(xshift="4c")
-    fig.basemap(**kwargs)
-    fig.shift_origin(yshift="6c")
-    fig.basemap(**kwargs)
-    fig.shift_origin(xshift="-4c", yshift="6c")
-    fig.basemap(**kwargs)
-    return fig
-
-
 def test_figure_show_invalid_method():
     """
     Test to check if an error is raised when an invalid method is passed to show.
@@ -407,22 +387,6 @@ def test_invalid_method(self):
             set_display(method="invalid")
 
 
-def test_figure_unsupported_xshift_yshift():
-    """
-    Raise an exception if X/Y/xshift/yshift is used.
-    """
-    fig = Figure()
-    fig.basemap(region=[0, 1, 0, 1], projection="X1c/1c", frame=True)
-    with pytest.raises(GMTInvalidInput):
-        fig.plot(x=1, y=1, style="c3c", xshift="3c")
-    with pytest.raises(GMTInvalidInput):
-        fig.plot(x=1, y=1, style="c3c", X="3c")
-    with pytest.raises(GMTInvalidInput):
-        fig.plot(x=1, y=1, style="c3c", yshift="3c")
-    with pytest.raises(GMTInvalidInput):
-        fig.plot(x=1, y=1, style="c3c", Y="3c")
-
-
 class TestGetDefaultDisplayMethod:
     """
     Test the _get_default_display_method function.

pygmt/tests/test_figure.py

@@ -0,0 +1,43 @@
+"""
+Test Figure.shift_origin.
+"""
+
+import pytest
+from pygmt.exceptions import GMTInvalidInput
+from pygmt.figure import Figure
+
+
+@pytest.mark.mpl_image_compare
+def test_shift_origin():
+    """
+    Test if fig.shift_origin works.
+    """
+    kwargs = {"region": [0, 3, 0, 5], "projection": "X3c/5c", "frame": 0}
+    fig = Figure()
+    # First call shift_origin without projection and region.
+    # Test issue https://github.com/GenericMappingTools/pygmt/issues/514
+    fig.shift_origin(xshift="2c", yshift="3c")
+    fig.basemap(**kwargs)
+    fig.shift_origin(xshift="4c")
+    fig.basemap(**kwargs)
+    fig.shift_origin(yshift="6c")
+    fig.basemap(**kwargs)
+    fig.shift_origin(xshift="-4c", yshift="6c")
+    fig.basemap(**kwargs)
+    return fig
+
+
+def test_shift_origin_unsupported_xshift_yshift():
+    """
+    Raise an exception if X/Y/xshift/yshift is used.
+    """
+    fig = Figure()
+    fig.basemap(region=[0, 1, 0, 1], projection="X1c/1c", frame=True)
+    with pytest.raises(GMTInvalidInput):
+        fig.plot(x=1, y=1, style="c3c", xshift="3c")
+    with pytest.raises(GMTInvalidInput):
+        fig.plot(x=1, y=1, style="c3c", X="3c")
+    with pytest.raises(GMTInvalidInput):
+        fig.plot(x=1, y=1, style="c3c", yshift="3c")
+    with pytest.raises(GMTInvalidInput):
+        fig.plot(x=1, y=1, style="c3c", Y="3c")