Figure.plot3d: Update parameter 'color' to 'fill' in test_plot3d.py (#2193)

Author: seisman

pygmt/tests/test_plot3d.py

@@ -43,7 +43,7 @@ def test_plot3d_red_circles_zscale(data, region):
         region=region,
         projection="X10c",
         style="c0.2c",
-        color="red",
+        fill="red",
         frame=["afg", "zafg"],
     )
     return fig
@@ -62,27 +62,27 @@ def test_plot3d_red_circles_zsize(data, region):
         region=region,
         projection="X10c",
         style="c0.2c",
-        color="red",
+        fill="red",
         frame=["afg", "zafg"],
     )
     return fig
 
 
 def test_plot3d_fail_1d_array_with_data(data, region):
     """
-    Should raise an exception if array color, size, intensity and transparency
+    Should raise an exception if array fill, size, intensity and transparency
     are used with matrix.
     """
     fig = Figure()
     kwargs = dict(data=data, region=region, projection="X10c", frame="afg")
     with pytest.raises(GMTInvalidInput):
-        fig.plot3d(style="c0.2c", color=data[:, 2], **kwargs)
+        fig.plot3d(style="c0.2c", fill=data[:, 2], **kwargs)
     with pytest.raises(GMTInvalidInput):
-        fig.plot3d(style="cc", size=data[:, 2], color="red", **kwargs)
+        fig.plot3d(style="cc", size=data[:, 2], fill="red", **kwargs)
     with pytest.raises(GMTInvalidInput):
-        fig.plot3d(style="cc", intensity=data[:, 2], color="red", **kwargs)
+        fig.plot3d(style="cc", intensity=data[:, 2], fill="red", **kwargs)
     with pytest.raises(GMTInvalidInput):
-        fig.plot3d(style="cc", color="red", transparency=data[:, 2] * 100, **kwargs)
+        fig.plot3d(style="cc", fill="red", transparency=data[:, 2] * 100, **kwargs)
 
 
 @pytest.mark.mpl_image_compare
@@ -100,7 +100,7 @@ def test_plot3d_projection(data, region):
         region=region,
         projection="R270/10c",
         style="s1c",
-        color="green",
+        fill="green",
         frame=["ag", "zag"],
     )
     return fig
@@ -109,7 +109,7 @@ def test_plot3d_projection(data, region):
 @pytest.mark.mpl_image_compare
 def test_plot3d_colors(data, region):
     """
-    Plot the data using z as colors.
+    Plot the data using z as fills.
     """
     fig = Figure()
     fig.plot3d(
@@ -118,7 +118,7 @@ def test_plot3d_colors(data, region):
         z=data[:, 2],
         zscale=5,
         perspective=[225, 30],
-        color=data[:, 2],
+        fill=data[:, 2],
         region=region,
         projection="X6c",
         style="c0.5c",
@@ -146,7 +146,7 @@ def test_plot3d_sizes(data, region):
         # Using inches instead of cm because of upstream bug at
         # https://github.com/GenericMappingTools/gmt/issues/4386
         style="ui",
-        color="blue",
+        fill="blue",
         frame=["af", "zaf"],
     )
     return fig
@@ -155,7 +155,7 @@ def test_plot3d_sizes(data, region):
 @pytest.mark.mpl_image_compare
 def test_plot3d_colors_sizes(data, region):
     """
-    Plot the data using z as sizes and colors.
+    Plot the data using z as sizes and fills.
     """
     fig = Figure()
     fig.plot3d(
@@ -164,7 +164,7 @@ def test_plot3d_colors_sizes(data, region):
         z=data[:, 2],
         zscale=5,
         perspective=[225, 30],
-        color=data[:, 2],
+        fill=data[:, 2],
         size=0.5 * data[:, 2],
         region=region,
         projection="X6c",
@@ -180,7 +180,7 @@ def test_plot3d_colors_sizes(data, region):
 @pytest.mark.mpl_image_compare
 def test_plot3d_colors_sizes_proj(data, region):
     """
-    Plot the data using z as sizes and colors with a projection.
+    Plot the data using z as sizes and fills with a projection.
     """
     fig = Figure()
     fig.plot3d(
@@ -192,7 +192,7 @@ def test_plot3d_colors_sizes_proj(data, region):
         region=region,
         projection="M20c",
         frame=["af", "zaf"],
-        color=data[:, 2],
+        fill=data[:, 2],
         size=data[:, 2],
         # Using inches instead of cm because of upstream bug at
         # https://github.com/GenericMappingTools/gmt/issues/4386
@@ -223,7 +223,7 @@ def test_plot3d_varying_intensity():
         perspective=[135, 30],
         frame=["Sltr", "xaf+lIntensity"],
         style="c0.5c",
-        color="blue",
+        fill="blue",
         intensity=intensity,
     )
     return fig
@@ -244,7 +244,7 @@ def test_plot3d_transparency():
         y=y,
         z=z,
         style="u0.2c",
-        color="blue",
+        fill="blue",
         region=[0, 10, 0, 10, 10, 90],
         projection="X10c",
         zscale=0.1,
@@ -270,7 +270,7 @@ def test_plot3d_varying_transparency():
         y=y,
         z=z,
         style="o0.2c+B5",
-        color="blue",
+        fill="blue",
         region=[0, 10, 0, 10, 10, 90],
         projection="X10c",
         zscale=0.1,
@@ -284,12 +284,12 @@ def test_plot3d_varying_transparency():
 @pytest.mark.mpl_image_compare
 def test_plot3d_sizes_colors_transparencies():
     """
-    Plot the data with varying sizes and colors using z as transparency.
+    Plot the data with varying sizes and fills using z as transparency.
     """
     x = np.arange(1.0, 10.0)
     y = np.arange(1.0, 10.0)
     z = np.arange(1, 10) * 10
-    color = np.arange(1, 10) * 0.15
+    fill = np.arange(1, 10) * 0.15
     size = np.arange(1, 10) * 0.2
     transparency = np.arange(1, 10) * 10
 
@@ -304,7 +304,7 @@ def test_plot3d_sizes_colors_transparencies():
         perspective=[135, 30],
         frame=True,
         style="uc",
-        color=color,
+        fill=fill,
         size=size,
         cmap="gray",
         transparency=transparency,
@@ -314,8 +314,8 @@ def test_plot3d_sizes_colors_transparencies():
 
 @pytest.mark.mpl_image_compare
 @pytest.mark.mpl_image_compare(filename="test_plot3d_matrix.png")
-@pytest.mark.parametrize("color", ["#aaaaaa", 170])
-def test_plot3d_matrix(data, region, color):
+@pytest.mark.parametrize("fill", ["#aaaaaa", 170])
+def test_plot3d_matrix(data, region, fill):
     """
     Plot the data passing in a matrix and specifying incols.
     """
@@ -327,7 +327,7 @@ def test_plot3d_matrix(data, region, color):
         region=region,
         projection="M20c",
         style="c1c",
-        color=color,
+        fill=fill,
         frame=["a", "za"],
         incols="0,1,2",
     )
@@ -367,7 +367,7 @@ def test_plot3d_from_file(region):
         region=region,
         projection="X20c",
         style="d1c",
-        color="yellow",
+        fill="yellow",
         frame=["af", "zaf"],
         incols=[0, 1, 2],
     )
@@ -396,7 +396,7 @@ def test_plot3d_vectors():
         region=[-2, 2, -2, 2, -2, 2],
         projection="X10c",
         style="V1c+e+n",
-        color="black",
+        fill="black",
         frame=["af", "zaf"],
     )
     return fig
@@ -415,11 +415,11 @@ def test_plot3d_scalar_xyz():
         perspective=[225, 30],
     )
     fig.plot3d(
-        x=-1.5, y=1.5, z=-1.5, style="c1c", color="red", zscale=True, perspective=True
+        x=-1.5, y=1.5, z=-1.5, style="c1c", fill="red", zscale=True, perspective=True
     )
-    fig.plot3d(x=0, y=0, z=0, style="t1c", color="green", zscale=True, perspective=True)
+    fig.plot3d(x=0, y=0, z=0, style="t1c", fill="green", zscale=True, perspective=True)
     fig.plot3d(
-        x=1.5, y=-1.5, z=1.5, style="s1c", color="blue", zscale=True, perspective=True
+        x=1.5, y=-1.5, z=1.5, style="s1c", fill="blue", zscale=True, perspective=True
     )
     return fig