Merge branch 'master' into parameters-histogram

Author: willschlitzer

.github/workflows/ci_tests.yaml

@@ -141,7 +141,7 @@ jobs:
 
       # Upload coverage to Codecov
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.4.1
+        uses: codecov/codecov-action@v1.5.0
         with:
           file: ./coverage.xml # optional
           env_vars: OS,PYTHON,NUMPY

CONTRIBUTING.md

@@ -219,7 +219,7 @@ General guidelines for pull requests (PRs):
   do.
 * Each pull request should consist of a **small** and logical collection of changes.
 * Larger changes should be broken down into smaller components and integrated
-  separately.
+  separately. For example, break the wrapping of aliases into multiple pull requests.
 * Bug fixes should be submitted in separate PRs.
 * Use underscores for all Python (*.py) files as per [PEP8](https://www.python.org/dev/peps/pep-0008/),
   not hyphens. Directory names should also use underscores instead of hyphens.
@@ -303,6 +303,12 @@ warn us and you can make a new commit with the formatted code.
 Even better, you can just write `/format` in the first line of any comment in a
 Pull Request to lint the code automatically.
 
+When wrapping a new alias, use an underscore to separate words bridged by vowels
+(aeiou), such as `no_skip` and `z_only`. Do not use an underscore to separate
+words bridged only by consonants, such as `distcalc`, and `crossprofile`. This
+convention is not applied by the code checking tools, but the PyGMT maintainers
+will comment on any pull requests as needed.
+
 We also use [flake8](http://flake8.pycqa.org/en/latest/) and
 [pylint](https://www.pylint.org/) to check the quality of the code and quickly catch
 common errors.

pygmt/src/meca.py

@@ -98,8 +98,8 @@ def data_format_code(convention, component="full"):
 @use_alias(
     R="region",
     J="projection",
+    A="offset",
     B="frame",
-    C="offset",
     N="no_clip",
     V="verbose",
     X="xshift",
@@ -334,8 +334,8 @@ def update_pointers(data_pointers):
                 if arg is None:
                     spec.append(0)
                 else:
-                    if "C" not in kwargs:
-                        kwargs["C"] = True
+                    if "A" not in kwargs:
+                        kwargs["A"] = True
                     spec.append(arg)
 
         # or assemble the 2D array for the case of lists as values
@@ -389,8 +389,8 @@ def update_pointers(data_pointers):
                     if arg is None:
                         row.append(0)
                     else:
-                        if "C" not in kwargs:
-                            kwargs["C"] = True
+                        if "A" not in kwargs:
+                            kwargs["A"] = True
                         row.append(arg[index])
                 spec_array.append(row)
             spec = spec_array
@@ -435,8 +435,8 @@ def update_pointers(data_pointers):
                     if arg is None:
                         row.append(0)
                     else:
-                        if "C" not in kwargs:
-                            kwargs["C"] = True
+                        if "A" not in kwargs:
+                            kwargs["A"] = True
                         row.append(arg[index])
                 spec_array.append(row)
             spec = spec_array