Merge branch 'master' into fixes-grdseamount

GenericMappingTools · Feb 11, 2025 · 6ccb4ab · 6ccb4ab
2 parents a8eb949 + 85f1cf4
commit 6ccb4ab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci-caches.yml b/.github/workflows/ci-caches.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Install GMT
-        uses: mamba-org/[email protected].3
+        uses: mamba-org/[email protected].4
         with:
           environment-name: gmt
           condarc: |

diff --git a/.github/workflows/dvc-diff.yml b/.github/workflows/dvc-diff.yml
@@ -33,7 +33,7 @@ jobs:
       uses: iterative/setup-cml@v3
 
     - name: Setup Micromamba
-      uses: mamba-org/[email protected].3
+      uses: mamba-org/[email protected].4
       with:
         environment-name: gmt
         condarc: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -173,7 +173,7 @@ jobs:
         if: failure()
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v5.3.1
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

diff --git a/doc/rst/source/supplements/potential/gravfft.rst b/doc/rst/source/supplements/potential/gravfft.rst
@@ -272,7 +272,7 @@ offset due to the fact that *z* is positive up):
 
 ::
 
-  gmt gravfft bat.grd=+o-6000 -D600 -Gmoho_g.grd
+  gmt gravfft bat.grd+o-6000 -D600 -Gmoho_g.grd
 
 Now, subtract it from the Bouguer to obtain the MBA anomaly. That is:
-Original file line number
+Diff line change
@@ Expand Up / @@ -272,7 +272,7 @@ offset due to the fact that *z* is positive up): @@
     ::
-      gmt gravfft bat.grd=+o-6000 -D600 -Gmoho_g.grd
+      gmt gravfft bat.grd+o-6000 -D600 -Gmoho_g.grd
     Now, subtract it from the Bouguer to obtain the MBA anomaly. That is:
@@ Expand Down @@