Figure.contour: Reorder input parameters to 'data, x, y, z' (#1561)

Author: michaelgrund

pygmt/src/contour.py

@@ -5,6 +5,7 @@
 from pygmt.clib import Session
 from pygmt.helpers import (
     build_arg_string,
+    check_data_input_order,
     deprecate_parameter,
     fmt_docstring,
     kwargs_to_strings,
@@ -14,6 +15,7 @@
 
 @fmt_docstring
 @deprecate_parameter("columns", "incols", "v0.4.0", remove_version="v0.6.0")
+@check_data_input_order("v0.5.0", remove_version="v0.7.0")
 @use_alias(
     A="annotation",
     B="frame",
@@ -41,7 +43,7 @@
     t="transparency",
 )
 @kwargs_to_strings(R="sequence", c="sequence_comma", i="sequence_comma", p="sequence")
-def contour(self, x=None, y=None, z=None, data=None, **kwargs):
+def contour(self, data=None, x=None, y=None, z=None, **kwargs):
     r"""
     Contour table data by direct triangulation.
 
@@ -56,12 +58,12 @@ def contour(self, x=None, y=None, z=None, data=None, **kwargs):
 
     Parameters
     ----------
-    x/y/z : 1d arrays
-        Arrays of x and y coordinates and values z of the data points.
     data : str or {table-like}
         Pass in (x, y, z) or (longitude, latitude, elevation) values by
         providing a file name to an ASCII data table, a 2D
         {table-classes}
+    x/y/z : 1d arrays
+        Arrays of x and y coordinates and values z of the data points.
     {J}
     {R}
     annotation : str or int

pygmt/tests/test_contour.py

@@ -98,7 +98,7 @@ def test_contour_deprecate_columns_to_incols(region):
 
     with pytest.warns(expected_warning=FutureWarning) as record:
         fig.contour(
-            data=data,
+            data,
             projection="X10c",
             region=region,
             frame="a",