Merge branch 'main' into pytest/mark-benchmark-part2

Author: weiji14

.github/workflows/benchmarks.yml

@@ -61,7 +61,7 @@ jobs:
           echo $CONDA/bin >> $GITHUB_PATH
           conda install --solver=libmamba gmt=6.4.0 python=3.12 \
                         numpy pandas xarray netCDF4 packaging \
-                        geopandas pyarrow pytest pytest-benchmark pytest-mpl
+                        geopandas pyarrow pytest pytest-mpl
           python -m pip install -U pytest-codspeed setuptools
 
       # Download cached remote files (artifacts) from GitHub

.github/workflows/cache_data.yaml

@@ -1,18 +1,21 @@
-# Cache GMT remote data files and uploads as artifacts
+# Cache GMT remote data files and upload as artifacts
 #
 # This workflow downloads data files needed by PyGMT tests/documentation from
 # the GMT data server and uploads as workflow artifacts which can be accessed
 # by other GitHub Actions workflows.
 #
 # It is scheduled to run every Sunday at 12:00 (UTC). If new remote files are
-# needed urgently, maintainers can manually uncomment the 'pull_request:' line
-# below to refresh the cache.
+# needed urgently, maintainers can update the workflow file or
+# 'pygmt/helpers/caching.py' file to refresh the cache.
 #
 name: Cache data
 
 on:
-  # Uncomment the 'pull_request' line below to manually re-cache data artifacts
-  # pull_request:
+  pull_request:
+    # Make any changes to the following files to refresh the cache
+    paths:
+      - 'pygmt/helpers/caching.py'
+      - '.github/workflows/cache_data.yaml'
   # Schedule runs on 12 noon every Sunday
   schedule:
     - cron: '0 12 * * 0'
@@ -61,7 +64,7 @@ jobs:
       # Download remote files
       - name: Download remote data
         run: |
-          python -c "from pygmt.helpers.testing import download_test_data; download_test_data()"
+          python -c "from pygmt.helpers.caching import cache_data; cache_data()"
 
       # Upload the downloaded files as artifacts to GitHub
       - name: Upload artifacts to GitHub

.github/workflows/ci_docs.yml

@@ -72,7 +72,7 @@ jobs:
             channels:
               - conda-forge
               - nodefaults
-          cache-downloads: true
+          cache-downloads: false
           cache-environment: true
           create-args: >-
             python=3.12

.github/workflows/ci_tests.yaml

@@ -101,7 +101,7 @@ jobs:
             channels:
               - conda-forge
               - nodefaults
-          cache-downloads: true
+          cache-downloads: false
           cache-environment: true
           create-args: >-
             python=${{ matrix.python-version }}${{ matrix.optional-packages }}

.github/workflows/ci_tests_dev.yaml

@@ -57,31 +57,22 @@ jobs:
           # fetch all history so that setuptools-scm works
           fetch-depth: 0
 
-      # Generate token from GenericMappingTools bot
-      - name: Generate token from GenericMappingTools bot
-        uses: tibdex/github-app-token@v2
-        if: github.event_name == 'repository_dispatch'
-        id: generate-token
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
       # Checkout the pull request branch
       - name: Checkout
         uses: actions/[email protected]
         if: github.event_name == 'repository_dispatch'
         with:
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
           ref: ${{ github.event.client_payload.pull_request.head.ref }}
           # fetch all history so that setuptools-scm works
           fetch-depth: 0
 
       - name: Show job URL
         uses: peter-evans/[email protected]
-        if: github.event_name == 'repository_dispatch' && (matrix.os == 'ubuntu-latest')
+        if: github.event_name == 'repository_dispatch' && runner.os == 'Linux'
         with:
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
           comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
           body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
@@ -95,7 +86,7 @@ jobs:
             channels:
               - conda-forge
               - nodefaults
-          cache-downloads: true
+          cache-downloads: false
           cache-environment: true
           create-args: >-
             python=3.12

.github/workflows/ci_tests_legacy.yaml

@@ -59,7 +59,7 @@ jobs:
             channels:
               - conda-forge
               - nodefaults
-          cache-downloads: true
+          cache-downloads: false
           cache-environment: true
           create-args: >-
             python=3.9

.github/workflows/format-command.yml

@@ -32,7 +32,7 @@ jobs:
       # Install formatting tools
       - name: Install formatting tools
         run: |
-          python -m pip install docformatter ruff
+          python -m pip install ruff
           python -m pip list
           sudo apt-get install dos2unix
 

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

@@ -13,17 +13,10 @@ jobs:
     if: ${{ github.event.issue.pull_request }}
     runs-on: ubuntu-latest
     steps:
-      # Generate token from GenericMappingTools bot
-      - uses: tibdex/github-app-token@v2
-        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@v3
         with:
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           commands: |
             format
             test-gmt-dev

.github/workflows/style_checks.yaml

@@ -34,11 +34,11 @@ jobs:
 
       - name: Install packages
         run: |
-          python -m pip install docformatter ruff
+          python -m pip install ruff
           python -m pip list
           sudo apt-get install dos2unix
 
-      - name: Formatting check (docformatter, ruff)
+      - name: Formatting check (ruff)
         run: make check
 
       - name: Ensure files use UNIX line breaks and have 644 permission

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2023 The PyGMT Developers
+Copyright (c) 2017-2024 The PyGMT Developers
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,