Merge branch 'master' into longopts-gmtconvert

GenericMappingTools · Nov 18, 2023 · 2a6f0c7 · 2a6f0c7
2 parents ade1c74 + 5f5bb44
commit 2a6f0c7
Show file tree

Hide file tree

Showing 521 changed files with 5,505 additions and 2,321 deletions.
diff --git a/.github/workflows/dvc-diff.yml b/.github/workflows/dvc-diff.yml
@@ -33,7 +33,7 @@ jobs:
       uses: iterative/setup-cml@v2.0.1
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1.5.0
+      uses: mamba-org/setup-micromamba@v1.6.0
       with:
         environment-name: gmt
         condarc: |
@@ -45,12 +45,6 @@ jobs:
         create-args: >-
           gmt
 
-    # workaround from https://github.com/iterative/cml/issues/1377
-    - name: Setup NodeJS
-      uses: actions/setup-node@v3.8.1
-      with:
-        node-version: '16'
-
     # Produce the markdown diff report, which should look like:
     # ## Summary of changed images
     #

diff --git a/ci/install-dependencies-linux.sh b/ci/install-dependencies-linux.sh
@@ -45,6 +45,9 @@ conda update -n base -c conda-forge conda --solver libmamba
 conda install ${conda_packages} -c conda-forge --solver libmamba
 echo "${CONDA}/bin" >> $GITHUB_PATH
 
+# Remove pcre-config from conda's path so cmake won't find the conda's one
+rm -f ${CONDA}/bin/pcre-config ${CONDA}/bin/pcre2-config
+
 # Install Sphinx extensions
 if [ "$BUILD_DOCS" = "true" ]; then
     ${CONDA}/bin/python -m pip install --user -r doc/rst/requirements.txt

diff --git a/ci/install-dependencies-macos.sh b/ci/install-dependencies-macos.sh
@@ -45,6 +45,9 @@ conda update -n base -c conda-forge conda --solver libmamba
 conda install ${conda_packages} -c conda-forge --solver libmamba
 echo "${CONDA}/bin" >> $GITHUB_PATH
 
+# Remove pcre-config from conda's path so cmake won't find the conda's one
+rm -f ${CONDA}/bin/pcre-config ${CONDA}/bin/pcre2-config
+
 # Install Sphinx extensions
 if [ "$BUILD_DOCS" = "true" ]; then
     ${CONDA}/bin/python -m pip install --user -r doc/rst/requirements.txt

diff --git a/ci/install-dependencies-windows.sh b/ci/install-dependencies-windows.sh
@@ -53,6 +53,10 @@ $CONDA\\condabin\\conda.bat install ${conda_packages} -c conda-forge --solver li
 echo "$CONDA\\Library\\bin" >> $GITHUB_PATH
 echo "$CONDA\\Scripts" >> $GITHUB_PATH
 
+# Add the vcpkg path again so it's prepended before conda's path and cmake can find
+# the vcpkg library correctly
+echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH
+
 # Install Sphinx extensions
 if [ "$BUILD_DOCS" = "true" ]; then
     ${CONDA}/python -m pip install --user -r doc/rst/requirements.txt

diff --git a/doc/examples/.gitignore b/doc/examples/.gitignore
diff --git a/doc/examples/images.dvc b/doc/examples/images.dvc
diff --git a/doc/examples/images/.gitignore b/doc/examples/images/.gitignore
@@ -0,0 +1 @@
+*.ps
diff --git a/doc/examples/images/ex01.ps.dvc b/doc/examples/images/ex01.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 08a2e5d2a7f9135d82ea0ae2ac99579f
+  size: 338598
+  hash: md5
+  path: ex01.ps
diff --git a/doc/examples/images/ex02.ps.dvc b/doc/examples/images/ex02.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: fad03a8dc558ecac634a8b88ea619250
+  size: 865873
+  hash: md5
+  path: ex02.ps
diff --git a/doc/examples/images/ex03.ps.dvc b/doc/examples/images/ex03.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: d4827f7c0c43ea34f94e539f1bfa7e55
+  size: 72664
+  hash: md5
+  path: ex03.ps
diff --git a/doc/examples/images/ex04.ps.dvc b/doc/examples/images/ex04.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 307901e55d819418d70a3e7713046887
+  size: 607318
+  hash: md5
+  path: ex04.ps
diff --git a/doc/examples/images/ex04c.ps.dvc b/doc/examples/images/ex04c.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 061c172ba4aedbde304ac4bfd6d7f75b
+  size: 378179
+  hash: md5
+  path: ex04c.ps
diff --git a/doc/examples/images/ex05.ps.dvc b/doc/examples/images/ex05.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 71d5d70676cdc2622b8ef89f5e00ac73
+  size: 506539
+  hash: md5
+  path: ex05.ps
diff --git a/doc/examples/images/ex06.ps.dvc b/doc/examples/images/ex06.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 9813f7fb167eaec7b963aa3d8d65531a
+  size: 28408
+  hash: md5
+  path: ex06.ps
diff --git a/doc/examples/images/ex07.ps.dvc b/doc/examples/images/ex07.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: f917bf82f4c4722fd7837f27275b279b
+  size: 102822
+  hash: md5
+  path: ex07.ps
diff --git a/doc/examples/images/ex08.ps.dvc b/doc/examples/images/ex08.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: de41373d6dc789baff5e0f5f4da474a0
+  size: 2212834
+  hash: md5
+  path: ex08.ps
diff --git a/doc/examples/images/ex09.ps.dvc b/doc/examples/images/ex09.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 03d6040145b93e3c9e34433d271f8046
+  size: 342948
+  hash: md5
+  path: ex09.ps
diff --git a/doc/examples/images/ex10.ps.dvc b/doc/examples/images/ex10.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 5014ce09d6fe8406258e9e81e372cdbd
+  size: 148160
+  hash: md5
+  path: ex10.ps
diff --git a/doc/examples/images/ex11.ps.dvc b/doc/examples/images/ex11.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 75d5637e2d95ff525494625885256606
+  size: 1091529
+  hash: md5
+  path: ex11.ps
diff --git a/doc/examples/images/ex12.ps.dvc b/doc/examples/images/ex12.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: c9049724b426016caa290c2168d12664
+  size: 78589
+  hash: md5
+  path: ex12.ps
diff --git a/doc/examples/images/ex13.ps.dvc b/doc/examples/images/ex13.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: b9149b00b7560bc27f06a066df99b7f7
+  size: 148482
+  hash: md5
+  path: ex13.ps
diff --git a/doc/examples/images/ex14.ps.dvc b/doc/examples/images/ex14.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 19f87e08bdfcc8ba1dc5c72a4f3a262a
+  size: 61390
+  hash: md5
+  path: ex14.ps
diff --git a/doc/examples/images/ex15.ps.dvc b/doc/examples/images/ex15.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 045a9fee7b18fa6b152dd200992ee32a
+  size: 2513023
+  hash: md5
+  path: ex15.ps
diff --git a/doc/examples/images/ex16.ps.dvc b/doc/examples/images/ex16.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: df907fae27fdda1b58056863af3d7eaa
+  size: 386416
+  hash: md5
+  path: ex16.ps
diff --git a/doc/examples/images/ex17.ps.dvc b/doc/examples/images/ex17.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: c2b9b205e09bd547886c920280bb8522
+  size: 528693
+  hash: md5
+  path: ex17.ps
diff --git a/doc/examples/images/ex18.ps.dvc b/doc/examples/images/ex18.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: afdba9c8d13ec9bee12088502d1f2075
+  size: 363801
+  hash: md5
+  path: ex18.ps
diff --git a/doc/examples/images/ex19.ps.dvc b/doc/examples/images/ex19.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 299cbc1cc17c17cc1a3dda1bbdb249bb
+  size: 411124
+  hash: md5
+  path: ex19.ps
diff --git a/doc/examples/images/ex20.ps.dvc b/doc/examples/images/ex20.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 940a4342cf14931bf83dbd1e49fa806b
+  size: 128669
+  hash: md5
+  path: ex20.ps
diff --git a/doc/examples/images/ex21.ps.dvc b/doc/examples/images/ex21.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 988740319be5b76a3dee2f1ec6bd9943
+  size: 102970
+  hash: md5
+  path: ex21.ps
diff --git a/doc/examples/images/ex22.ps.dvc b/doc/examples/images/ex22.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 89e71bd726ef040cd85eccbc6b0f0a4f
+  size: 182130
+  hash: md5
+  path: ex22.ps
diff --git a/doc/examples/images/ex23.ps.dvc b/doc/examples/images/ex23.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 1b5e262f48b85921fe378dd9207bd8a0
+  size: 1997227
+  hash: md5
+  path: ex23.ps
diff --git a/doc/examples/images/ex24.ps.dvc b/doc/examples/images/ex24.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 74b01d6d1c0735575af2a0155ebc527e
+  size: 300863
+  hash: md5
+  path: ex24.ps
diff --git a/doc/examples/images/ex25.ps.dvc b/doc/examples/images/ex25.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: b91608ab5959d860608a20399c50fac2
+  size: 118293
+  hash: md5
+  path: ex25.ps
diff --git a/doc/examples/images/ex26.ps.dvc b/doc/examples/images/ex26.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: e5f75b9d8c715fd7c1b0f8a263a356f9
+  size: 195305
+  hash: md5
+  path: ex26.ps
diff --git a/doc/examples/images/ex27.ps.dvc b/doc/examples/images/ex27.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 711b91c1e9ce135c4cefe5c0423dd0d3
+  size: 2404580
+  hash: md5
+  path: ex27.ps
diff --git a/doc/examples/images/ex28.ps.dvc b/doc/examples/images/ex28.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: a2480da6a0860464edc57b41f197f658
+  size: 1039001
+  hash: md5
+  path: ex28.ps
diff --git a/doc/examples/images/ex29.ps.dvc b/doc/examples/images/ex29.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: b22feed290df699ce63fca7417a646cb
+  size: 286387
+  hash: md5
+  path: ex29.ps
diff --git a/doc/examples/images/ex30.ps.dvc b/doc/examples/images/ex30.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: bb594fe661dd7940bf78e1a8af6f8868
+  size: 33782
+  hash: md5
+  path: ex30.ps
diff --git a/doc/examples/images/ex31.ps.dvc b/doc/examples/images/ex31.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 0ac74fd663eb32296334ca7d22aa325f
+  size: 554276
+  hash: md5
+  path: ex31.ps
diff --git a/doc/examples/images/ex32.ps.dvc b/doc/examples/images/ex32.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 925184952e603054c6b768c1f62cae4d
+  size: 1464471
+  hash: md5
+  path: ex32.ps
diff --git a/doc/examples/images/ex33.ps.dvc b/doc/examples/images/ex33.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: f393ea9a81e4cfbf9c09878aec0118f9
+  size: 904035
+  hash: md5
+  path: ex33.ps
diff --git a/doc/examples/images/ex34.ps.dvc b/doc/examples/images/ex34.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 892d54dcebe045ef673f87b677cdbc60
+  size: 1492129
+  hash: md5
+  path: ex34.ps
diff --git a/doc/examples/images/ex35.ps.dvc b/doc/examples/images/ex35.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 65b92e89e91c0f35b51a194b2885e36a
+  size: 823296
+  hash: md5
+  path: ex35.ps
diff --git a/doc/examples/images/ex36.ps.dvc b/doc/examples/images/ex36.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 7b477ec60633cf07619ac381b32b474c
+  size: 225250
+  hash: md5
+  path: ex36.ps
diff --git a/doc/examples/images/ex37.ps.dvc b/doc/examples/images/ex37.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: c7f860156d3347f9971d78ecbf46f0d6
+  size: 436205
+  hash: md5
+  path: ex37.ps
diff --git a/doc/examples/images/ex38.ps.dvc b/doc/examples/images/ex38.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 9f8af211369a5ef5b94a6063e43b4e24
+  size: 906119
+  hash: md5
+  path: ex38.ps
diff --git a/doc/examples/images/ex39.ps.dvc b/doc/examples/images/ex39.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 6b97297b4c899fa516329bfb3e5237b9
+  size: 545331
+  hash: md5
+  path: ex39.ps
diff --git a/doc/examples/images/ex40.ps.dvc b/doc/examples/images/ex40.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 2593c103ab54880a8cb2f9684f86481f
+  size: 1086037
+  hash: md5
+  path: ex40.ps
diff --git a/doc/examples/images/ex41.ps.dvc b/doc/examples/images/ex41.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 57dae2c4622e72b2b4b3c64088cfa7d5
+  size: 1774717
+  hash: md5
+  path: ex41.ps
diff --git a/doc/examples/images/ex42.ps.dvc b/doc/examples/images/ex42.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 21c7284833af7f7e2524f831fbc8a807
+  size: 2596990
+  hash: md5
+  path: ex42.ps
diff --git a/doc/examples/images/ex43.ps.dvc b/doc/examples/images/ex43.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 3a12689ef3eb2bc30c042fb89c686204
+  size: 45539
+  hash: md5
+  path: ex43.ps
diff --git a/doc/examples/images/ex44.ps.dvc b/doc/examples/images/ex44.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: a2628204dba0dff6b66d34a0eb356915
+  size: 1429237
+  hash: md5
+  path: ex44.ps
diff --git a/doc/examples/images/ex45.ps.dvc b/doc/examples/images/ex45.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: e8af47e5460dd98121129eee9015bc0c
+  size: 90000
+  hash: md5
+  path: ex45.ps
diff --git a/doc/examples/images/ex46.ps.dvc b/doc/examples/images/ex46.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 63099f450d94aa5bf6824c2f58cf6dfa
+  size: 251831
+  hash: md5
+  path: ex46.ps
diff --git a/doc/examples/images/ex47.ps.dvc b/doc/examples/images/ex47.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 705ff7cf7226e84b785fd46159eeca0c
+  size: 90762
+  hash: md5
+  path: ex47.ps
diff --git a/doc/examples/images/ex48.ps.dvc b/doc/examples/images/ex48.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: ec9b6b44473b759e899ef054e5e78116
+  size: 2083270
+  hash: md5
+  path: ex48.ps
diff --git a/doc/examples/images/ex49.ps.dvc b/doc/examples/images/ex49.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: daf004484cbd15bcf609fe7584cf4656
+  size: 1258444
+  hash: md5
+  path: ex49.ps
diff --git a/doc/examples/images/ex50.ps.dvc b/doc/examples/images/ex50.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 2f77ec166630cb099be9ef954785b840
+  size: 71636
+  hash: md5
+  path: ex50.ps
diff --git a/doc/examples/images/ex51.ps.dvc b/doc/examples/images/ex51.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: cb768260acd029b2645ac26988aab131
+  size: 41241
+  hash: md5
+  path: ex51.ps
diff --git a/doc/examples/images/ex52.ps.dvc b/doc/examples/images/ex52.ps.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 2e9f58baf5ba59bfe9b8142ec34ce076
+  size: 1147740
+  hash: md5
+  path: ex52.ps
diff --git a/doc/rst/requirements.txt b/doc/rst/requirements.txt
@@ -6,7 +6,7 @@
 #
 sphinx_rtd_theme==1.3.0
 sphinx-copybutton==0.5.2
-sphinx_design==0.5.0
+sphinx-design==0.5.0
 sphinx-jinja==2.0.2
 sphinx-togglebutton==0.3.2
 sphinxcontrib-youtube==1.4.1