Merge branch 'master' into pyproject

Author: seisman

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,3 +15,7 @@ Fixes #
 - [ ] Add new public functions/methods/classes to `doc/api/index.rst`.
 - [ ] Write detailed docstrings for all functions/methods.
 - [ ] If adding new functionality, add an example to docstrings or tutorials.
+
+**Notes**
+
+- You can write `/format` in the first line of a comment to lint the code automatically

.github/workflows/format-command.yml

@@ -0,0 +1,47 @@
+name: format-command
+on:
+  repository_dispatch:
+    types: [format-command]
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      # Generate token from GenericMappingTools bot
+      - uses: tibdex/github-app-token@v1
+        id: generate-token
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      # Checkout the pull request branch
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.client_payload.pull_request.head.ref }}
+
+      # Setup Python environment
+      - uses: actions/setup-python@v1
+
+      # Install formatting tools
+      - name: Install formatting tools
+        run: pip install black blackdoc flake8
+
+      # Run "make format" and commit the change to the PR branch
+      - name: Commit to the PR branch if any changes
+        run: |
+          make format
+          if [[ $(git ls-files -m) ]]; then
+            git config --global user.name 'actions-bot'
+            git config --global user.email '[email protected]'
+            git commit -am "[format-command] fixes"
+            git push
+          fi
+
+      - name: Add reaction
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
+          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
+          reaction-type: hooray

.github/workflows/slash-command-dispatch.yml

@@ -0,0 +1,24 @@
+name: Slash Command Dispatch
+on:
+  issue_comment:
+    types: [created]
+    # Add "edited" type for test purposes. Where possible, avoid using to prevent processing unnecessary events.
+    # types: [created, edited]
+jobs:
+  slashCommandDispatch:
+    runs-on: ubuntu-latest
+    steps:
+      # Generate token from GenericMappingTools bot
+      - uses: tibdex/github-app-token@v1
+        id: generate-token
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Slash Command Dispatch
+        uses: peter-evans/slash-command-dispatch@v2
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          commands: |
+            format
+          issue-type: pull-request

CONTRIBUTING.md

@@ -255,9 +255,10 @@ Before committing, run it to automatically format your code:
 make format
 ```
 
-Don't worry if you forget to do it.
-Our continuous integration systems will warn us and you can make a new commit with the
-formatted code.
+Don't worry if you forget to do it. Our continuous integration systems will
+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.
 
 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

pygmt/tests/test_clib.py

@@ -161,13 +161,8 @@ def test_call_module_error_message():
         try:
             lib.call_module("info", "bogus-data.bla")
         except GMTCLibError as error:
-            msg = "\n".join(
-                [
-                    "Module 'info' failed with status code 71:",
-                    "gmtinfo [ERROR]: Cannot find file bogus-data.bla",
-                ]
-            )
-            assert str(error) == msg
+            assert "Module 'info' failed with status code" in str(error)
+            assert "gmtinfo [ERROR]: Cannot find file bogus-data.bla" in str(error)
 
 
 def test_method_no_session():

pygmt/tests/test_grdimage.py

@@ -1,6 +1,7 @@
 """
 Test Figure.grdimage
 """
+import sys
 import numpy as np
 import pytest
 import xarray as xr
@@ -73,9 +74,9 @@ def test_grdimage_file():
     return fig
 
 
-@pytest.mark.xfail(
+@pytest.mark.skip(
     reason="Upstream bug in GMT 6.1.1",
-    condition=gmt_version <= Version("6.1.1"),
+    condition=gmt_version <= Version("6.1.1") and sys.platform == "darwin",
 )
 @check_figures_equal()
 @pytest.mark.parametrize(

pygmt/tests/test_info.py

@@ -8,17 +8,13 @@
 import pandas as pd
 import pytest
 import xarray as xr
-from packaging.version import Version
 
-from .. import clib, info
+from .. import info
 from ..exceptions import GMTInvalidInput
 
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data")
 POINTS_DATA = os.path.join(TEST_DATA_DIR, "points.txt")
 
-with clib.Session() as _lib:
-    gmt_version = Version(_lib.info["version"])
-
 
 def test_info():
     "Make sure info works on file name inputs"
@@ -43,7 +39,6 @@ def test_info_dataframe():
 
 
 @pytest.mark.xfail(
-    condition=gmt_version <= Version("6.1.1"),
     reason="UNIX timestamps returned instead of ISO datetime, should work on GMT 6.2.0 "
     "after https://github.com/GenericMappingTools/gmt/issues/4241 is resolved",
 )
@@ -63,7 +58,6 @@ def test_info_pandas_dataframe_time_column():
 
 
 @pytest.mark.xfail(
-    condition=gmt_version <= Version("6.1.1"),
     reason="UNIX timestamp returned instead of ISO datetime, should work on GMT 6.2.0 "
     "after https://github.com/GenericMappingTools/gmt/issues/4241 is resolved",
 )