Merge branch 'main' into wrap-clip

GenericMappingTools · Jul 7, 2022 · 2a7f11e · 2a7f11e
2 parents d330c1c + 5b64bf2
commit 2a7f11e
Show file tree

Hide file tree

Showing 68 changed files with 1,218 additions and 787 deletions.
diff --git a/.github/workflows/cache_data.yaml b/.github/workflows/cache_data.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3.0.2
         with:
-          # fecth all history so that setuptools-scm works
+          # fetch all history so that setuptools-scm works
           fetch-depth: 0
 
       # Install Mambaforge with conda-forge dependencies

diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -44,6 +44,7 @@ jobs:
           --exclude "^https://www.generic-mapping-tools.org/remote-datasets/%s$"
           --exclude "^https://hackmd.io/@pygmt"
           --exclude "^https://doi.org"
+          --exclude "^https://www.researchgate.net/project/"
           --verbose
           "repository/**/*.rst"
           "repository/**/*.md"

diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml
@@ -43,15 +43,15 @@ jobs:
     steps:
       # Cancel previous runs that are not completed
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.10.0
         with:
           access_token: ${{ github.token }}
 
       # Checkout current git repository
       - name: Checkout
         uses: actions/checkout@v3.0.2
         with:
-          # fecth all history so that setuptools-scm works
+          # fetch all history so that setuptools-scm works
           fetch-depth: 0
 
       # Install Mambaforge with conda-forge dependencies
@@ -72,15 +72,15 @@ jobs:
         run: |
           mamba install gmt=6.3.0 numpy pandas xarray netCDF4 packaging \
                         build ipython make myst-parser geopandas \
-                        sphinx sphinx-copybutton sphinx-gallery sphinx_rtd_theme
+                        sphinx sphinx-copybutton sphinx-design sphinx-gallery sphinx_rtd_theme
 
       # Show installed pkg information for postmortem diagnostic
       - name: List installed packages
         run: mamba list
 
       # Download cached remote files (artifacts) from GitHub
       - name: Download remote data from GitHub
-        uses: dawidd6/action-download-artifact@v2.20.0
+        uses: dawidd6/action-download-artifact@v2.21.1
         with:
           workflow: cache_data.yaml
           workflow_conclusion: success

diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
@@ -34,20 +34,17 @@ jobs:
         # Is it a draft Pull Request (true or false)?
         isDraft:
           - ${{ github.event.pull_request.draft }}
-        # Only run one job (Ubuntu + Python 3.10) for draft PRs
+        # Only run two jobs (Ubuntu + Python 3.8/3.10) for draft PRs
         exclude:
           - os: macOS-latest
             isDraft: true
           - os: windows-latest
             isDraft: true
-          # - os: ubuntu-latest
-          #   python-version: 3.7
-          #   isDraft: true
-        # Pair Python 3.8 with NumPy 1.19 and Python 3.10 with NumPy 1.22
+        # Pair Python 3.8 with NumPy 1.20 and Python 3.10 with NumPy 1.22
         # Only install optional packages on Python 3.10/NumPy 1.22
         include:
           - python-version: '3.8'
-            numpy-version: '1.19'
+            numpy-version: '1.20'
             optional-packages: ''
           - python-version: '3.10'
             numpy-version: '1.22'
@@ -66,15 +63,15 @@ jobs:
     steps:
       # Cancel previous runs that are not completed
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.10.0
         with:
           access_token: ${{ github.token }}
 
       # Checkout current git repository
       - name: Checkout
         uses: actions/checkout@v3.0.2
         with:
-          # fecth all history so that setuptools-scm works
+          # fetch all history so that setuptools-scm works
           fetch-depth: 0
 
       # Install Mambaforge with conda-forge dependencies
@@ -105,7 +102,7 @@ jobs:
 
       # Download cached remote files (artifacts) from GitHub
       - name: Download remote data from GitHub
-        uses: dawidd6/action-download-artifact@v2.20.0
+        uses: dawidd6/action-download-artifact@v2.21.1
         with:
           workflow: cache_data.yaml
           workflow_conclusion: success

diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml
@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.10']
-        os: [ubuntu-latest, macOS-11.0, windows-2022]
+        os: [ubuntu-22.04, macOS-12, windows-2022]
         gmt_git_ref: [master]
     timeout-minutes: 30
     defaults:
@@ -39,7 +39,7 @@ jobs:
     steps:
       # Cancel previous runs that are not completed
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.10.0
         with:
           access_token: ${{ github.token }}
 
@@ -48,7 +48,7 @@ jobs:
         uses: actions/checkout@v3.0.2
         if: github.event_name != 'repository_dispatch'
         with:
-          # fecth all history so that setuptools-scm works
+          # fetch all history so that setuptools-scm works
           fetch-depth: 0
 
       # Generate token from GenericMappingTools bot
@@ -68,7 +68,7 @@ jobs:
           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 }}
-          # fecth all history so that setuptools-scm works
+          # fetch all history so that setuptools-scm works
           fetch-depth: 0
 
       - name: Show job URL
@@ -137,7 +137,7 @@ jobs:
 
       # Download cached remote files (artifacts) from GitHub
       - name: Download remote data from GitHub
-        uses: dawidd6/action-download-artifact@v2.20.0
+        uses: dawidd6/action-download-artifact@v2.21.1
         with:
           workflow: cache_data.yaml
           workflow_conclusion: success

diff --git a/.github/workflows/format-command.yml b/.github/workflows/format-command.yml
@@ -21,7 +21,7 @@ jobs:
           ref: ${{ github.event.client_payload.pull_request.head.ref }}
 
       # Setup Python environment
-      - uses: actions/setup-python@v3.1.2
+      - uses: actions/setup-python@v4.0.0
 
       # Install formatting tools
       - name: Install formatting tools

diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -29,7 +29,7 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Python
-      uses: actions/setup-python@v3.1.2
+      uses: actions/setup-python@v4.0.0
       with:
         python-version: '3.10'
 

diff --git a/.github/workflows/style_checks.yaml b/.github/workflows/style_checks.yaml
@@ -20,7 +20,7 @@ jobs:
 
       # Setup Miniconda
       - name: Set up Python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: '3.10'
 

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -9,16 +9,18 @@ The following people have contributed code and/or documentation to the project
 (alphabetical by name) and are considered to be "PyGMT Developers":
 
 * [Abhishek Anant](https://twitter.com/itsabhianant) | [0000-0002-5751-2010](https://orcid.org/0000-0002-5751-2010) | Unaffiliated
+* [Andre L. Belem](https://github.com/andrebelem) | [0000-0002-8865-6180](https://orcid.org/0000-0002-8865-6180) | Fluminense Federal University, Brazil
 * [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | China University of Geosciences, China
 * [Jamie Quinn](http://jamiejquinn.com) | [0000-0002-0268-7032](https://orcid.org/0000-0002-0268-7032) | University College London, United Kingdom
 * [Jiayuan Yao](https://github.com/core-man) | [0000-0001-7036-4238](https://orcid.org/0000-0001-7036-4238) | Nanyang Technological University, Singapore
 * [Kathryn Materna](https://github.com/kmaterna) | [0000-0002-6687-980X](https://orcid.org/0000-0002-6687-980X) | US Geological Survey, USA
 * [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool, United Kingdom
 * [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | University of Alaska Fairbanks, USA
 * [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences, Germany
-* [Meghan Jones](https://github.com/meghanrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawai'i at Mānoa, USA
+* [Max Jones](https://github.com/maxrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawai'i at Mānoa, USA
 * [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018) | Innoplexia GmbH, Germany
 * [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon, USA
 * [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | The Ohio State University, USA
 * [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated
 * [Yohai Magen](https://github.com/yohaimagen) | [0000-0002-4892-4013](https://orcid.org/0000-0002-4892-4013) | Tel Aviv University, Israel
+* [Yvonne Fröhlich](https://github.com/yvonnefroehlich) | [0000-0002-8566-0619](https://orcid.org/0000-0002-8566-0619) | Karlsruhe Institute of Technology, Germany
diff --git a/CITATION.cff b/CITATION.cff
@@ -16,7 +16,7 @@ authors:
   family-names: Leong
   affiliation: The Ohio State University, USA
   orcid: https://orcid.org/0000-0003-2354-1988
-- given-names: Meghan
+- given-names: Max
   family-names: Jones
   affiliation: University of Hawai'i at Mānoa, USA
   orcid: https://orcid.org/0000-0003-0180-8928
@@ -44,6 +44,14 @@ authors:
   family-names: Materna
   affiliation: US Geological Survey, USA
   orcid: https://orcid.org/0000-0002-6687-980X
+- given-names: Yvonne
+  family-names: Fröhlich
+  affiliation: Karlsruhe Institute of Technology, Germany
+  orcid: https://orcid.org/0000-0002-8566-0619
+- given-names: Andre
+  family-names: Belem
+  affiliation: Fluminense Federal University, Brazil
+  orcid: https://orcid.org/0000-0002-8865-6180
 - given-names: Tyler
   family-names: Newton
   affiliation: University of Oregon, USA
@@ -64,9 +72,9 @@ authors:
   family-names: Wessel
   affiliation: University of Hawai'i at Mānoa, USA
   orcid: https://orcid.org/0000-0001-5708-7336
-date-released: 2022-04-11
-doi: 10.5281/zenodo.6426493
+date-released: 2022-07-01
+doi: 10.5281/zenodo.6702566
 license: BSD-3-Clause
 repository-code: https://github.com/GenericMappingTools/pygmt
 type: software
-version: 0.6.1
+version: 0.7.0
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -61,7 +61,7 @@ representative at an online or offline event.
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement
 by contacting [Leonardo Uieda](http://www.leouieda.com) (preferred) or
-[Meghan Jones](https://www.soest.hawaii.edu/soestwp/about/directory/meghan-jones/).
+[Max Jones](https://forum.generic-mapping-tools.org/u/maxrjones).
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

diff --git a/README.rst b/README.rst
@@ -86,6 +86,10 @@ Simple installation using `conda <https://docs.conda.io/projects/conda/en/latest
 
     conda install --channel conda-forge pygmt
 
+If you use `mamba <https://mamba.readthedocs.org/>`__::
+
+    mamba install --channel conda-forge pygmt
+
 For other ways to install ``pygmt``, see `full installation instructions <https://www.pygmt.org/latest/install.html>`__.
 
 
@@ -152,11 +156,11 @@ Developers". Feel free to cite our work in your research using the following Bib
 
 .. code-block::
 
-    @software{pygmt_2022_6426493,
+    @software{pygmt_2022_6702566,
       author       = {Uieda, Leonardo and
                       Tian, Dongdong and
                       Leong, Wei Ji and
-                      Jones, Meghan and
+                      Jones, Max and
                       Schlitzer, William and
                       Grund, Michael and
                       Toney, Liam and
@@ -169,12 +173,12 @@ Developers". Feel free to cite our work in your research using the following Bib
                       Quinn, Jamie and
                       Wessel, Paul},
       title        = {{PyGMT: A Python interface for the Generic Mapping Tools}},
-      month        = apr,
+      month        = jul,
       year         = 2022,
       publisher    = {Zenodo},
-      version      = {v0.6.1},
-      doi          = {10.5281/zenodo.6426493},
-      url          = {https://doi.org/10.5281/zenodo.6426493}
+      version      = {v0.7.0},
+      doi          = {10.5281/zenodo.6702566},
+      url          = {https://doi.org/10.5281/zenodo.6702566}
     }
 
 To cite a specific version of PyGMT, go to our Zenodo page at
@@ -231,8 +235,13 @@ Compatibility with GMT/Python/NumPy versions
       - `Dev Documentation <https://www.pygmt.org/dev>`_ (reflects `main branch <https://github.com/GenericMappingTools/pygmt>`_)
       - >=6.3.0
       - >=3.8
-      - >=1.19
-    * - `v0.6.1 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.6.1>`_ (latest release)
+      - >=1.20
+    * - `v0.7.0 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.7.0>`_ (latest release)
+      - `v0.7.0 Documentation <https://www.pygmt.org/v0.7.0>`_
+      - >=6.3.0
+      - >=3.8
+      - >=1.20
+    * - `v0.6.1 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.6.1>`_
       - `v0.6.1 Documentation <https://www.pygmt.org/v0.6.1>`_
       - >=6.3.0
       - >=3.8

diff --git a/doc/_static/style.css b/doc/_static/style.css
@@ -203,37 +203,3 @@ a.copybtn {
 .sphx-glr-single-img {
     max-width: 80%!important;
 }
-
-.team-row {
-    display: flex;
-    flex-wrap: wrap;
-}
-
-.team-card {
-    background-color: #fff;
-    background-clip: border-box;
-    border: 1px solid rgba(0,0,0,.125);
-    border-radius: 0.5rem;
-    margin: 0.25em;
-    flex: 0 1 175px;
-}
-
-.team-img {
-    border-radius: 0.5rem;
-    width: 100%;
-    height: 20vh!important;
-    object-fit: cover;
-}
-
-.team-card-body {
-    padding: 1.25rem;
-    height: 135px;
-}
-
-.team-card-text {
-    display: flex;
-    margin-block-start: 0em;
-    margin-block-end: 0.2em;
-    margin-inline-start: 0px;
-    margin-inline-end: 0px;
-}
diff --git a/doc/_static/version_switch.js b/doc/_static/version_switch.js
@@ -12,6 +12,7 @@
   var all_versions = {
     'latest': 'latest',
     'dev': 'dev',
+    'v0.7.0': 'v0.7.0',
     'v0.6.1': 'v0.6.1',
     'v0.6.0': 'v0.6.0',
     'v0.5.0': 'v0.5.0',

diff --git a/doc/_templates/breadcrumbs.html b/doc/_templates/breadcrumbs.html
@@ -5,7 +5,7 @@
 {% block breadcrumbs_aside %}
     <li class="source-link">
         {% if hasdoc(pagename) %}
-            {% if pagename.startswith("api/generated") or suffix == ".ipynb" %}
+            {% if pagename.startswith("api/generated") or page_source_suffix == ".ipynb" %}
                 {% set title = "Suggested improvement for " + pagename %}
                 {% set body = "Please describe what could be improved about this page or the typo/mistake that you found:" %}
                 <a href="https://github.com/{{ github_repo }}/issues/new?title={{ title|urlencode }}&body={{ body|urlencode }}"
@@ -21,7 +21,7 @@
                 <a href="https://github.com/{{ github_repo }}/edit/{{ github_version }}/{{ doc_path }}/{{ example_script }}"
                    class="fa fa-github"> Improve this page</a>
             {% else %}
-                <a href="https://github.com/{{ github_repo }}/edit/{{ github_version }}/{{ doc_path }}/{{ pagename }}{{ suffix }}"
+                <a href="https://github.com/{{ github_repo }}/edit/{{ github_version }}/{{ doc_path }}/{{ pagename }}{{ page_source_suffix }}"
                    class="fa fa-github"> Improve this page</a>
             {% endif %}
         {% endif %}

diff --git a/doc/api/index.rst b/doc/api/index.rst
@@ -115,6 +115,7 @@ Operations on tabular data
 .. autosummary::
     :toctree: generated
 
+    binstats
     blockmean
     blockmedian
     blockmode