Merge branch 'master' into fix-requirements-comments

Author: weiji14

.github/workflows/cache_data.yaml

@@ -16,7 +16,7 @@ jobs:
     steps:
       # Setup Miniconda
       - name: Setup Miniconda
-        uses: conda-incubator/[email protected].0
+        uses: conda-incubator/[email protected].1
         with:
           channels: conda-forge
           miniconda-version: "latest"

.github/workflows/ci_tests.yaml

@@ -37,7 +37,7 @@ jobs:
     steps:
       # Cancel previous runs that are not completed
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.4.1
+        uses: styfle/cancel-workflow-action@0.8.0
         with:
           access_token: ${{ github.token }}
 
@@ -50,7 +50,7 @@ jobs:
 
       # Setup Miniconda
       - name: Setup Miniconda
-        uses: conda-incubator/[email protected].0
+        uses: conda-incubator/[email protected].1
         with:
           python-version: ${{ matrix.python-version }}
           channels: conda-forge
@@ -76,7 +76,7 @@ jobs:
 
       # Download cached remote files (artifacts) from GitHub
       - name: Download remote data from GitHub
-        uses: dawidd6/action-download-artifact@v2.10.0
+        uses: dawidd6/action-download-artifact@v2.11.0
         with:
           workflow: cache_data.yaml
           workflow_conclusion: success
@@ -89,7 +89,9 @@ jobs:
         run: |
           mkdir -p ~/.gmt
           mv .gmt/* ~/.gmt
-          ls -lh ~/.gmt
+          # Change modification times of the two files, so GMT won't refresh it
+          touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt
+          ls -lhR ~/.gmt
 
       # Install the package that we want to test
       - name: Install the package

.github/workflows/ci_tests_dev.yaml

@@ -37,7 +37,7 @@ jobs:
     steps:
       # Cancel previous runs that are not completed
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.4.1
+        uses: styfle/cancel-workflow-action@0.8.0
         with:
           access_token: ${{ github.token }}
 
@@ -71,7 +71,7 @@ jobs:
 
       # Setup Miniconda
       - name: Setup Miniconda
-        uses: conda-incubator/[email protected].0
+        uses: conda-incubator/[email protected].1
         with:
           python-version: ${{ matrix.python-version }}
           channels: conda-forge
@@ -95,7 +95,7 @@ jobs:
 
       # Download cached remote files (artifacts) from GitHub
       - name: Download remote data from GitHub
-        uses: dawidd6/action-download-artifact@v2.10.0
+        uses: dawidd6/action-download-artifact@v2.11.0
         with:
           workflow: cache_data.yaml
           workflow_conclusion: success
@@ -108,14 +108,20 @@ jobs:
         run: |
           mkdir -p ~/.gmt
           mv .gmt/* ~/.gmt
-          ls -lh ~/.gmt
+          # Change modification times of the two files, so GMT won't refresh it
+          touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt
+          ls -lhR ~/.gmt
 
       # Install the package that we want to test
       - name: Install the package
         run: |
           python setup.py sdist --formats=zip
           pip install dist/*
 
+      - name: Add GMT's bin to PATH (Linux/macOS)
+        run: echo ${GITHUB_WORKSPACE}/gmt-install-dir/bin >> $GITHUB_PATH
+        if: runner.os != 'Windows'
+
       # Run the tests
       - name: Test with pytest (Linux/macOS)
         run: make test PYTEST_EXTRA="-r P"

.github/workflows/release-drafter.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5.8.0
+      - uses: release-drafter/release-drafter@v5.14.0
         with:
           # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
           config-name: release-drafter.yml

AUTHORS.md

@@ -5,13 +5,14 @@ during [an NSF funded postdoc](http://www.leouieda.com/blog/hawaii-gmt-postdoc.h
 with [Paul Wessel](http://www.soest.hawaii.edu/wessel) at the University of Hawaii at
 Manoa.
 
-The following people have contributed code to the project (alphabetical by last name)
-and are considered the "PyGMT Developers":
+The following people have contributed code and/or documentation to the project
+(alphabetical by name) and are considered to be "PyGMT Developers":
 
-* [Michael Grund](https://github.com/michaelgrund)
-* [Wei Ji Leong](https://github.com/weiji14)
-* [Tyler Newton](http://www.tnewton.com/)
-* [William Schlitzer](https://github.com/willschlitzer)
-* [Dongdong Tian](https://seisman.info/)
-* [Liam Toney](https://liam.earth/)
-* [Leonardo Uieda](http://www.leouieda.com/)
+* [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | Department of Earth and Environmental Sciences, Michigan State University, East Lansing, MI, USA
+* [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | Department of Earth, Ocean and Ecological Sciences, University of Liverpool, Liverpool, United Kingdom
+* [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | Alaska Volcano Observatory and Wilson Alaska Technical Center, Geophysical Institute, University of Alaska Fairbanks, Fairbanks, AK, USA
+* [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences, Potsdam, Germany
+* [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018)
+* [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | Department of Earth Sciences, University of Oregon, Eugene, OR, USA
+* [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | Antarctic Research Centre, Victoria University of Wellington, Wellington, New Zealand
+* [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated

AUTHORSHIP.md

@@ -36,9 +36,9 @@ be invited to be an author on the Zenodo archive of new releases.
 To be included as an author, you *must* add the following to the `AUTHORS.md`
 file of the repository:
 
-1. Full name
-2. Affiliation (if omitted, we will use "Unaffiliated")
-3. ORCID (optional)
+1. Full name (and a link to your website or GitHub page)
+2. [ORCID](https://orcid.org) (optional)
+3. Affiliation (if omitted, we will use "Unaffiliated")
 
 The order of authors will be defined by the number of commits to the repository
 (`git shortlog -sne`). The order can also be changed on a case-by-case basis.
@@ -54,18 +54,21 @@ there are a few options:
 ## Scientific publications (papers)
 
 We aim to write academic papers for most of our software packages. Ideally, we
-will publish updated papers for major changes or significant new components of the
-package.
+will publish updated papers for major changes or significant new components of
+the package.
 
 To be included as an author on the paper, you *must* satisfy the following
 criteria:
 
-1. Have made multiple and regular contributions to the repository, or the GMT repository, in numerous facets, such as wrapping functions, testing, and/or writing documentation.
-2. Have made non-coding contributions, including project administration and decision making.
+1. Have made multiple and regular contributions to the repository, or the GMT
+   repository, in numerous facets, such as wrapping functions, testing, and/or
+   writing documentation.
+2. Have made non-coding contributions, including project administration and
+   decision making.
 3. Have participated in the writing and reviewing of the paper.
-2. Add your full name, affiliation, and (optionally) ORCID to the paper. These
+4. Add your full name, affiliation, and (optionally) ORCID to the paper. These
    can be submitted on pull requests to the corresponding paper repository.
-3. Write and/or read and review the manuscript in a timely manner and provide
+5. Write and/or read and review the manuscript in a timely manner and provide
    comments on the paper (even if it's just an "OK", but preferably more).
 
 The order of authors will be defined by the number of commits made since the

doc/api/index.rst

@@ -36,14 +36,17 @@ Plotting data and laying out the map:
     Figure.meca
     Figure.plot
     Figure.plot3d
+    Figure.set_panel
     Figure.shift_origin
+    Figure.subplot
     Figure.text
 
 Color palette table generation:
 
 .. autosummary::
     :toctree: generated
 
+    grd2cpt
     makecpt
 
 Saving and displaying the figure:

doc/index.rst

@@ -39,6 +39,7 @@
     tutorials/earth-relief.rst
     tutorials/3d-perspective-image.rst
     tutorials/inset.rst
+    tutorials/subplots.rst
     tutorials/configuration.rst
 
 .. toctree::