Merge branch 'master' into psconvert-no-file-dup

GenericMappingTools · Jan 1, 2025 · 30a0941 · 30a0941
2 parents b07866b + beab594
commit 30a0941
Show file tree

Hide file tree

Showing 529 changed files with 567 additions and 565 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Setup vcpkg (Windows)
         run: gh run download -n vcpkg-cache -D C:/vcpkg/installed/

diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout the repository
-      uses: actions/[email protected].0
+      uses: actions/[email protected].2
 
     - name: Link Checker
       id: lychee

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/setup-micromamba@v1.9.0
+        uses: mamba-org/setup-micromamba@v2.0.3
         with:
           environment-name: gmt
           condarc: |
@@ -116,7 +116,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Download GSHHG and DCW datasets
         run: bash ci/download-coastlines.sh
@@ -135,7 +135,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Install vcpkg libraries
         run: bash ci/install-dependencies-windows.sh

diff --git a/.github/workflows/code-validator.yml b/.github/workflows/code-validator.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Check PSL_strings.h
         run: |

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -92,7 +92,7 @@ jobs:
           fi
 
       - name: Checkout
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       # Fix the git error:
       # "failed to run git: fatal: detected dubious ownership in repository at '/__w/gmt/gmt'"

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Setup vcpkg (Windows)
         run: gh run download -n vcpkg-cache -D C:/vcpkg/installed/
@@ -134,7 +134,7 @@ jobs:
           echo "${INSTALLDIR}/bin" >> $GITHUB_PATH
 
       - name: Checkout the gh-pages branch in a separate folder
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           ref: gh-pages
           # Checkout to this folder instead of the current one

diff --git a/.github/workflows/dvc-diff.yml b/.github/workflows/dvc-diff.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].0
+      uses: actions/[email protected].2
 
     - name: Setup data version control (DVC)
       uses: iterative/setup-dvc@v2
@@ -33,7 +33,7 @@ jobs:
       uses: iterative/setup-cml@v3
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1.9.0
+      uses: mamba-org/setup-micromamba@v2.0.3
       with:
         environment-name: gmt
         condarc: |

diff --git a/.github/workflows/lint-checker.yml b/.github/workflows/lint-checker.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Check out repository
-      uses: actions/[email protected].0
+      uses: actions/[email protected].2
 
     - name: Install cppcheck
       run: |

diff --git a/.github/workflows/release-baseline-images.yml b/.github/workflows/release-baseline-images.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].0
+      uses: actions/[email protected].2
 
     - name: Setup data version control (DVC)
       uses: iterative/setup-dvc@v2

diff --git a/.github/workflows/remind.yml b/.github/workflows/remind.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].0
+      uses: actions/[email protected].2
 
     - name: Find and report known failures
       run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -60,7 +60,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Setup vcpkg (Windows)
         run: gh run download -n vcpkg-cache -D C:/vcpkg/installed/

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#	Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+#	Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 #	See LICENSE.TXT file for copying and redistribution conditions.
 #
 #	This program is free software; you can redistribute it and/or modify

diff --git a/LICENSE.TXT b/LICENSE.TXT
@@ -1,4 +1,4 @@
-Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 
 As of GMT 5.0.0, GMT is distributed under the GNU Lesser General Public
 License (LGPL) version 3 or later. Copies of the GNU General Public

diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ Contributions are welcome and appreciated. Please refer to the [contributing gui
 
 ## License
 
-Copyright (c) 1991-2024 by [the GMT Team](https://www.generic-mapping-tools.org/team.html).
+Copyright (c) 1991-2025 by [the GMT Team](https://www.generic-mapping-tools.org/team.html).
 
 GMT is released under the
 [GNU Lesser General Public License](http://www.gnu.org/licenses/lgpl.html)

diff --git a/admin/Licenses/GMT-License.txt b/admin/Licenses/GMT-License.txt
@@ -1,4 +1,4 @@
-Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 
 As of GMT 5.0.0, GMT is distributed under the GNU Lesser General Public
 License (LGPL) version 3 or later. Copies of the GNU General Public

diff --git a/admin/copyright_year.sh b/admin/copyright_year.sh
@@ -5,8 +5,8 @@
 #   bash admin/copyright_year.sh
 #
 
-lastyear=2023
-newyear=2024
+lastyear=2024
+newyear=2025
 
 if [ ! -d cmake ]; then
     echo "Must be run from top-level gmt directory"

diff --git a/admin/gmt_make_pattern_include.sh b/admin/gmt_make_pattern_include.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2012-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 2012-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This script just makes the include file PSL_patterns.h

diff --git a/cmake/ConfigDefault.cmake b/cmake/ConfigDefault.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ set (GMT_PACKAGE_NAME "GMT")
 set (GMT_PACKAGE_DESCRIPTION_SUMMARY "The Generic Mapping Tools")
 
 # Year of the current GMT release.
-set (GMT_VERSION_YEAR "2024")
+set (GMT_VERSION_YEAR "2025")
 
 # The GMT release DOI
 set (GMT_VERSION_DOI "https://doi.org/10.5281/zenodo.10119499")

diff --git a/cmake/ConfigUserAdvancedTemplate.cmake b/cmake/ConfigUserAdvancedTemplate.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify it

diff --git a/cmake/ConfigUserTemplate.cmake b/cmake/ConfigUserTemplate.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # ============================================================================

diff --git a/cmake/dist/CMakeLists.txt b/cmake/dist/CMakeLists.txt
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/cmake/modules/CopyDirIfDifferent.cmake b/cmake/modules/CopyDirIfDifferent.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/cmake/modules/CreateDebugSym.cmake b/cmake/modules/CreateDebugSym.cmake
@@ -6,7 +6,7 @@
 #  DESTINATION - destination directory for installed targets
 #  TARGETS     - list of targets
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/cmake/modules/GmtGenExtraHeaders.cmake b/cmake/modules/GmtGenExtraHeaders.cmake
@@ -2,7 +2,7 @@
 #
 # - Generates extra header files
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/cmake/modules/GmtHelperMacros.cmake b/cmake/modules/GmtHelperMacros.cmake
@@ -2,7 +2,7 @@
 #
 # - Useful CMake macros
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/cmake/modules/ManageString.cmake b/cmake/modules/ManageString.cmake
@@ -77,7 +77,7 @@
 #       + PADDING: (Optional) apply padding at the location by the marker
 #           string PADDING
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/doc/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/doc/fig/CMakeLists.txt b/doc/fig/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/doc/rst/CMakeLists.txt b/doc/rst/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1991-2024 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+# Copyright (c) 1991-2025 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify