Merge branch 'main' into load_remote_dataset

GenericMappingTools · Jan 4, 2025 · f1280cc · f1280cc
2 parents 58d7be1 + 4b9314a
commit f1280cc
Show file tree

Hide file tree

Showing 93 changed files with 2,073 additions and 550 deletions.
diff --git a/.github/ISSUE_TEMPLATE/4-release_checklist.md b/.github/ISSUE_TEMPLATE/4-release_checklist.md
@@ -1,6 +1,6 @@
 ---
 name: PyGMT release checklist
-about: Checklist for a new PyGMT release.
+about: Checklist for a new PyGMT release. [For project maintainers only!]
 title: Release PyGMT vX.Y.Z
 labels: maintenance
 assignees: ''
@@ -23,7 +23,7 @@ assignees: ''
       core package dependencies (NumPy, pandas, Xarray)
 - [ ] Review the ["PyGMT Team" page](https://www.pygmt.org/dev/team.html)
 - [ ] Check to ensure that:
-  - [ ] Deprecations and related tests are removed for this version by running `grep --include="*.py" -r vX.Y.Z` from the base of the repository
+  - [ ] Deprecated workarounds/codes/tests are removed. Run `grep "# TODO" **/*.py` to find all potential TODOs.
   - [ ] All tests pass in the ["GMT Legacy Tests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_legacy.yaml)
   - [ ] All tests pass in the ["GMT Dev Tests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_dev.yaml)
   - [ ] All tests pass in the ["Doctests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_doctests.yaml)

diff --git a/.github/ISSUE_TEMPLATE/5-bump_gmt_checklist.md b/.github/ISSUE_TEMPLATE/5-bump_gmt_checklist.md
@@ -1,6 +1,6 @@
 ---
 name: Bump GMT version checklist
-about: Checklist for bumping the minimum required GMT version.
+about: Checklist for bumping the minimum required GMT version. [For project maintainers only!]
 title: Bump to GMT X.Y.Z
 labels: maintenance
 assignees: ''

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,7 +20,6 @@ Fixes #
 - [ ] Write detailed docstrings for all functions/methods.
 - [ ] If wrapping a new module, open a 'Wrap new GMT module' issue and submit reasonably-sized PRs.
 - [ ] If adding new functionality, add an example to docstrings or tutorials.
-- [ ] Use underscores (not hyphens) in names of Python files and directories.
 
 **Slash Commands**
 

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -58,14 +58,14 @@ jobs:
           cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
           create-args: >-
             gmt=6.5.0
-            python=3.12
+            python=3.13
             numpy
             pandas
             xarray
             netCDF4
             packaging
             geopandas
-            pyarrow
+            pyarrow-core
             pytest
             pytest-codspeed
             pytest-mpl

diff --git a/.github/workflows/cache_data.yaml b/.github/workflows/cache_data.yaml
@@ -51,7 +51,7 @@ jobs:
               - conda-forge
               - nodefaults
           create-args: >-
-            python=3.12
+            python=3.13
             gmt=6.5.0
             numpy
             pandas
@@ -76,7 +76,7 @@ jobs:
 
       # Upload the downloaded files as artifacts to GitHub
       - name: Upload artifacts to GitHub
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: gmt-cache
           include-hidden-files: true

diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml
@@ -55,7 +55,7 @@ jobs:
         # Is it a draft Pull Request (true or false)?
         isDraft:
           - ${{ github.event.pull_request.draft }}
-        # Only run one job (Ubuntu + Python 3.12) for draft PRs
+        # Only run jobs on Ubuntu for draft PRs
         exclude:
           - os: macos-latest
             isDraft: true
@@ -92,7 +92,7 @@ jobs:
           # environment cache is persistent for one week.
           cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
           create-args: >-
-            python=3.12
+            python=3.13
             gmt=6.5.0
             ghostscript=10.04.0
             numpy
@@ -103,11 +103,12 @@ jobs:
             contextily
             geopandas
             ipython
-            pyarrow
+            pyarrow-core
             rioxarray
             make
             pip
             python-build
+            geodatasets
             myst-nb
             panel
             sphinx>=6.2

diff --git a/.github/workflows/ci_doctests.yaml b/.github/workflows/ci_doctests.yaml
@@ -50,7 +50,7 @@ jobs:
               - conda-forge
               - nodefaults
           create-args: >-
-            python=3.12
+            python=3.13
             gmt=6.5.0
             numpy
             pandas
@@ -60,7 +60,7 @@ jobs:
             contextily
             geopandas
             ipython
-            pyarrow
+            pyarrow-core
             rioxarray
             make
             pip

diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.12']
+        python-version: ['3.11', '3.13']
         os: [ubuntu-latest, macos-latest, windows-latest]
         # Is it a draft Pull Request (true or false)?
         isDraft:
@@ -68,21 +68,21 @@ jobs:
           - os: windows-latest
             isDraft: true
         include:
-          # Python 3.10 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
-          - python-version: '3.10'
-            numpy-version: '1.24'
+          # Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
+          - python-version: '3.11'
+            numpy-version: '1.25'
             pandas-version: '=2.0'
             xarray-version: '=2023.04'
-            optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery'
-          # Python 3.12 + core packages (latest versions) + optional packages
-          - python-version: '3.12'
+            optional-packages: ' contextily geopandas<1 ipython pyarrow-core rioxarray sphinx-gallery'
+          # Python 3.13 + core packages (latest versions) + optional packages
+          - python-version: '3.13'
             numpy-version: '2.2'
             pandas-version: ''
             xarray-version: ''
-            optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery'
-          # Python 3.11 + core packages (Linux only)
+            optional-packages: ' contextily geopandas>=1.0 ipython pyarrow-core rioxarray sphinx-gallery'
+          # Python 3.12 + core packages (Linux only)
           - os: 'ubuntu-latest'
-            python-version: '3.11'
+            python-version: '3.12'
             numpy-version: ''
             pandas-version: ''
             xarray-version: ''
@@ -133,7 +133,6 @@ jobs:
             xarray${{ matrix.xarray-version }}
             netCDF4
             packaging
-            dvc
             make
             pip
             python-build
@@ -154,9 +153,19 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
 
+      - name: Install uv
+        uses: astral-sh/[email protected]
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dvc
+        run: |
+          uv pip install dvc
+          uv pip list
+
       # Pull baseline image data from dvc remote (DAGsHub)
       - name: Pull baseline image data from dvc remote
-        run: dvc pull --no-run-cache --verbose && ls -lhR pygmt/tests/baseline/
+        run: uv run dvc pull --no-run-cache --verbose && ls -lhR pygmt/tests/baseline/
 
       # Install the package that we want to test
       - name: Install the package
@@ -168,15 +177,15 @@ jobs:
 
       # Upload diff images on test failure
       - name: Upload diff images if any test fails
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         if: failure()
         with:
           name: artifact-${{ runner.os }}-${{ matrix.python-version }}
           path: tmp-test-dir-with-unique-name
 
       # Upload coverage to Codecov
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v5.1.2
         if: success() || failure()
         with:
           use_oidc: true

diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-15, windows-2022]
+        os: [ubuntu-24.04, macos-15, windows-2025]
         gmt_git_ref: [master]
     timeout-minutes: 30
     defaults:
@@ -69,7 +69,7 @@ jobs:
           # environment cache is persistent for one week.
           cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
           create-args: >-
-            python=3.12
+            python=3.13
             cmake
             make
             ninja
@@ -187,7 +187,7 @@ jobs:
 
       # Upload diff images on test failure
       - name: Upload diff images if any test fails
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         if: ${{ failure() }}
         with:
           name: artifact-GMT-${{ matrix.gmt_git_ref }}-${{ runner.os }}

diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml
@@ -59,7 +59,7 @@ jobs:
               - conda-forge
               - nodefaults
           create-args: >-
-            python=3.10
+            python=3.11
             gmt=${{ matrix.gmt_version }}
             ghostscript<10
             numpy<2
@@ -70,7 +70,7 @@ jobs:
             contextily
             geopandas
             ipython
-            pyarrow
+            pyarrow-core
             rioxarray
             sphinx-gallery
             make

diff --git a/.github/workflows/format-command.yml b/.github/workflows/format-command.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Generate token from GenericMappingTools bot
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         id: generate-token
         with:
           app-id: ${{ secrets.APP_ID }}
@@ -27,7 +27,7 @@ jobs:
       # Setup Python environment
       - uses: actions/[email protected]
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       # Install formatting tools
       - name: Install formatting tools

diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Set up Python
       uses: actions/[email protected]
       with:
-        python-version: '3.12'
+        python-version: '3.13'
 
     - name: Install dependencies
       run: python -m pip install build

diff --git a/.github/workflows/style_checks.yaml b/.github/workflows/style_checks.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Python
         uses: actions/[email protected]
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Install packages
         run: |
@@ -52,3 +52,15 @@ jobs:
             rm output.txt
             exit $nfiles
           fi
+
+      - name: Ensure hyphens are not used in names of directories and Python files
+        run: |
+          git ls-files '*.py' | grep '-' > output.txt || true
+          git ls-tree -rd --name-only HEAD | grep '-' >> output.txt || true
+          nfiles=$(wc --lines output.txt | awk '{print $1}')
+          if [[ $nfiles > 0 ]]; then
+            echo "Following directories/files use hyphens in file names:"
+            cat output.txt
+            rm output.txt
+            exit $nfiles
+          fi
diff --git a/.github/workflows/type_checks.yml b/.github/workflows/type_checks.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Set up Python
         uses: actions/[email protected]
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Install packages
         run: |

diff --git a/CITATION.cff b/CITATION.cff
@@ -40,14 +40,14 @@ authors:
   family-names: Yao
   affiliation: Nanyang Technological University, Singapore
   orcid: https://orcid.org/0000-0001-7036-4238
+- given-names: Jing-Hui
+  family-names: Tong
+  affiliation: National Taiwan Normal University, Taiwan
+  orcid: https://orcid.org/0009-0002-7195-3071
 - given-names: Yohai
   family-names: Magen
   affiliation: Tel Aviv University, Israel
   orcid: https://orcid.org/0000-0002-4892-4013
-- given-names: Tong
-  family-names: Jing-Hui
-  affiliation: National Taiwan Normal University, Taiwan
-  orcid: https://orcid.org/0009-0002-7195-3071
 - given-names: Kathryn
   family-names: Materna
   affiliation: US Geological Survey, USA
@@ -76,9 +76,9 @@ authors:
   family-names: Wessel
   affiliation: University of Hawaiʻi at Mānoa, USA
   orcid: https://orcid.org/0000-0001-5708-7336
-date-released: 2024-09-05
-doi: 10.5281/zenodo.13679420
+date-released: 2024-12-31
+doi: 10.5281/zenodo.14535921
 license: BSD-3-Clause
 repository-code: https://github.com/GenericMappingTools/pygmt
 type: software
-version: 0.13.0
+version: 0.14.0
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2024 The PyGMT Developers
+Copyright (c) 2017-2025 The PyGMT Developers
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,