Skip to content

Commit 632b9ed

Browse files
authored
Merge branch 'main' into feature/magnetic_rose
2 parents 46159df + b1d4bd7 commit 632b9ed

File tree

99 files changed

+1186
-486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1186
-486
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
version: 2
44
updates:
5-
65
- package-ecosystem: "github-actions"
76
directory: "/"
87
schedule:
@@ -15,3 +14,5 @@ updates:
1514
labels:
1615
- "maintenance"
1716
- "skip-changelog"
17+
cooldown:
18+
default-days: 7

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
# Run the benchmark tests
8686
- name: Run benchmarks
87-
uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
87+
uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
8888
with:
8989
mode: "instrumentation"
9090
# 'bash -el -c' is needed to use the custom shell.

.github/workflows/cache_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474

7575
# Upload the downloaded files as artifacts to GitHub
7676
- name: Upload artifacts to GitHub
77-
uses: actions/upload-artifact@v5.0.0
77+
uses: actions/upload-artifact@v6.0.0
7878
with:
7979
name: gmt-cache
8080
include-hidden-files: true

.github/workflows/cache_dvc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
dvc pull --no-run-cache --verbose && ls -lhR pygmt/tests/baseline/
5353
5454
- name: Upload DVC cache as artifacts to GitHub
55-
uses: actions/upload-artifact@v5.0.0
55+
uses: actions/upload-artifact@v6.0.0
5656
with:
5757
name: dvc-cache
5858
include-hidden-files: true

.github/workflows/ci_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
cd ../..
151151
152152
- name: Upload PDF as artifact for previewing on pull requests
153-
uses: actions/upload-artifact@v5.0.0
153+
uses: actions/upload-artifact@v6.0.0
154154
if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
155155
with:
156156
name: artifact-pygmt-docs-pdf

.github/workflows/ci_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190

191191
# Upload diff images on test failure
192192
- name: Upload diff images if any test fails
193-
uses: actions/upload-artifact@v5.0.0
193+
uses: actions/upload-artifact@v6.0.0
194194
if: failure()
195195
with:
196196
name: artifact-${{ matrix.os }}-${{ matrix.python-version }}

.github/workflows/ci_tests_dev.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,17 @@ jobs:
122122
if: runner.os != 'Windows'
123123

124124
- name: Build GMT on Windows
125-
shell: cmd
125+
shell: bash
126126
run: |
127127
cd gmt/
128128
mkdir build
129129
cd build
130-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
131-
cmake -G Ninja .. ^
132-
-DCMAKE_INSTALL_PREFIX=%GMT_INSTALL_DIR% ^
133-
-DCMAKE_BUILD_TYPE=Release ^
134-
-DCMAKE_PREFIX_PATH=%MAMBA_ROOT_PREFIX%\envs\pygmt\Library ^
135-
-DGMT_ENABLE_OPENMP=TRUE ^
130+
cmd.exe /c "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
131+
cmake -G Ninja .. \
132+
-DCMAKE_INSTALL_PREFIX="$GMT_INSTALL_DIR" \
133+
-DCMAKE_BUILD_TYPE=Release \
134+
-DCMAKE_PREFIX_PATH="$MAMBA_ROOT_PREFIX/envs/pygmt/Library" \
135+
-DGMT_ENABLE_OPENMP=TRUE \
136136
-DGMT_USE_THREADS=TRUE
137137
cmake --build .
138138
cmake --build . --target install
@@ -201,7 +201,7 @@ jobs:
201201

202202
# Upload diff images on test failure
203203
- name: Upload diff images if any test fails
204-
uses: actions/upload-artifact@v5.0.0
204+
uses: actions/upload-artifact@v6.0.0
205205
if: ${{ failure() }}
206206
with:
207207
name: artifact-${{ matrix.os }}-GMT-${{ matrix.gmt_git_ref }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
ls -lh dist/
7373
7474
- name: Store the distribution packages
75-
uses: actions/upload-artifact@v5.0.0
75+
uses: actions/upload-artifact@v6.0.0
7676
with:
7777
name: python-package-distributions
7878
path: dist/

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repos:
1616
- id: chmod
1717
args: ["644"]
1818
- repo: https://github.com/zizmorcore/zizmor-pre-commit
19-
rev: v1.14.2
19+
rev: v1.19.0
2020
hooks:
2121
- id: zizmor
2222

CITATION.cff

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ authors:
6868
family-names: Quinn
6969
affiliation: University College London, United Kingdom
7070
orcid: https://orcid.org/0000-0002-0268-7032
71+
- given-names: Xingchen
72+
family-names: He
73+
affiliation: Chengdu University of Technology, China
74+
orcid: https://orcid.org/0009-0004-7182-2252
7175
- given-names: Leonardo
7276
family-names: Uieda
7377
affiliation: Universidade de São Paulo, Brazil
@@ -76,9 +80,9 @@ authors:
7680
family-names: Wessel
7781
affiliation: University of Hawaiʻi at Mānoa, USA
7882
orcid: https://orcid.org/0000-0001-5708-7336
79-
date-released: 2025-10-03
80-
doi: 10.5281/zenodo.17156962
83+
date-released: 2026-01-12
84+
doi: 10.5281/zenodo.18080259
8185
license: BSD-3-Clause
8286
repository-code: https://github.com/GenericMappingTools/pygmt
8387
type: software
84-
version: 0.17.0
88+
version: 0.18.0

0 commit comments

Comments
 (0)