Merge branch 'main' into wrap-grdvolume

Author: willschlitzer

.github/workflows/cache_data.yaml

@@ -19,7 +19,7 @@ jobs:
     steps:
       # Checkout current git repository
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
         with:
           # fecth all history so that setuptools-scm works
           fetch-depth: 0

.github/workflows/check-links.yml

@@ -15,12 +15,12 @@ jobs:
 
     steps:
     - name: Checkout the repository
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.3.5
       with:
         path: repository
 
     - name: Checkout the documentation
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.3.5
       with:
         ref: gh-pages
         path: documentation

.github/workflows/ci_docs.yml

@@ -49,7 +49,7 @@ jobs:
 
       # Checkout current git repository
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
         with:
           # fecth all history so that setuptools-scm works
           fetch-depth: 0
@@ -80,7 +80,7 @@ jobs:
 
       # Download cached remote files (artifacts) from GitHub
       - name: Download remote data from GitHub
-        uses: dawidd6/action-download-artifact@v2.14.1
+        uses: dawidd6/action-download-artifact@v2.15.0
         with:
           workflow: cache_data.yaml
           workflow_conclusion: success
@@ -107,7 +107,7 @@ jobs:
         run: make -C doc clean all
 
       - name: Checkout the gh-pages branch
-        uses: actions/checkout@28c7f3d2b5162b5ddd3dfd9a45aa55eaf396478b
+        uses: actions/checkout@v2.3.5
         with:
           ref: gh-pages
           # Checkout to this folder instead of the current one

.github/workflows/ci_tests.yaml

@@ -72,7 +72,7 @@ jobs:
 
       # Checkout current git repository
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
         with:
           # fecth all history so that setuptools-scm works
           fetch-depth: 0
@@ -96,7 +96,7 @@ jobs:
           mamba install gmt=6.2.0 numpy=${{ matrix.numpy-version }} \
                         pandas xarray netCDF4 packaging \
                         ${{ matrix.optional-packages }} \
-                        dvc=2.3.0 make pytest>=6.0 \
+                        dvc make pytest>=6.0 \
                         pytest-cov pytest-mpl sphinx-gallery tomli
 
       # Show installed pkg information for postmortem diagnostic
@@ -105,7 +105,7 @@ jobs:
 
       # Download cached remote files (artifacts) from GitHub
       - name: Download remote data from GitHub
-        uses: dawidd6/action-download-artifact@v2.14.1
+        uses: dawidd6/action-download-artifact@v2.15.0
         with:
           workflow: cache_data.yaml
           workflow_conclusion: success

.github/workflows/ci_tests_dev.yaml

@@ -45,7 +45,7 @@ jobs:
 
       # Checkout current git repository
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
         if: github.event_name != 'repository_dispatch'
         with:
           # fecth all history so that setuptools-scm works
@@ -62,12 +62,12 @@ jobs:
 
       # Checkout the pull request branch
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.5
         if: github.event_name == 'repository_dispatch'
         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 }}
+          ref: ${{ github.event.pull_request.head.sha }}
           # fecth all history so that setuptools-scm works
           fetch-depth: 0
 
@@ -88,7 +88,7 @@ jobs:
       - name: Install dependencies
         run: |
           mamba install ninja cmake libblas libcblas liblapack fftw gdal geopandas \
-                        ghostscript libnetcdf hdf5 zlib curl pcre make dvc=2.3.0
+                        ghostscript libnetcdf hdf5 zlib curl pcre make dvc
           pip install --pre numpy pandas xarray netCDF4 packaging \
                             ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery \
                             tomli
@@ -107,7 +107,7 @@ jobs:
 
       # Download cached remote files (artifacts) from GitHub
       - name: Download remote data from GitHub
-        uses: dawidd6/action-download-artifact@v2.14.1
+        uses: dawidd6/action-download-artifact@v2.15.0
         with:
           workflow: cache_data.yaml
           workflow_conclusion: success

.github/workflows/dvc-diff.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.3.5
       with:
         # fetch all history so that dvc diff works
         fetch-depth: 0

.github/workflows/format-command.yml

@@ -14,11 +14,11 @@ jobs:
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
 
       # Checkout the pull request branch
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.5
         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 }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       # Setup Python environment
       - uses: actions/setup-python@v2.2.2

.github/workflows/publish-to-pypi.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.3.5
       with:
         # fetch all history so that setuptools-scm works
         fetch-depth: 0

.github/workflows/release-baseline-images.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.3.5
 
     - name: Setup data version control (DVC)
       uses: iterative/setup-dvc@v1.0.3

.github/workflows/style_checks.yaml

@@ -16,7 +16,7 @@ jobs:
     steps:
       # Checkout current git repository
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.3.5
 
       # Setup Miniconda
       - name: Set up Python