Skip to content

Commit 125927a

Browse files
committed
Merge branch 'main' into ci/check-links
2 parents d281ceb + 1feb81c commit 125927a

165 files changed

Lines changed: 2777 additions & 1296 deletions

File tree

Some content is hidden

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

.github/ISSUE_TEMPLATE/4-release_checklist.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ assignees: ''
2323
- [ ] Check [SPEC 0](https://scientific-python.org/specs/spec-0000/) to see if we need to bump the minimum supported versions of GMT, Python and core package dependencies (NumPy, pandas, Xarray)
2424
- [ ] Review the ["PyGMT Team" page](https://www.pygmt.org/dev/team.html)
2525
- [ ] README looks good on TestPyPI. Visit [TestPyPI](https://test.pypi.org/project/pygmt/#history), click the latest pre-release, and check the homepage.
26+
- [ ] Review new parameter names added/changed for clarity and consistency across the API
2627
- [ ] Check to ensure that:
2728
- [ ] Deprecated workarounds/codes/tests are removed. Run `grep -r "# TODO" --include="*.py" .` to find all potential TODOs.
2829
- [ ] All tests pass in the ["GMT Legacy Tests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_legacy.yaml)
2930
- [ ] All tests pass in the ["GMT Dev Tests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_dev.yaml)
3031
- [ ] All tests pass in the ["Doctests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_doctests.yaml)
32+
- [ ] All links work in the ["Check Links" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/check-links.yml)
3133
- [ ] Update warnings in `pygmt/_show_versions.py` as well as notes in [Not working transparency](https://www.pygmt.org/dev/install.html#not-working-transparency) regarding GMT-Ghostscript incompatibility
3234
- [ ] Reserve a DOI on [Zenodo](https://zenodo.org) by clicking on "New Version"
3335
- [ ] Finish up the "Changelog entry for v0.x.x" Pull Request (Use the previous changelog PR as a reference)
@@ -52,7 +54,7 @@ assignees: ''
5254
- [ ] Bump PyGMT version on https://github.com/GenericMappingTools/try-gmt (after conda-forge update)
5355
- [ ] Announce the release on:
5456
- [ ] GMT [forum](https://forum.generic-mapping-tools.org/c/news/) (do this announcement first! Requires moderator status)
55-
- [ ] [ResearchGate](https://www.researchgate.net) (after forum announcement; download the ZIP file of the new release from the release page and add it as research item via the **code** category, be sure to include the corresponding new Zenodo DOI)
57+
- [ ] [ResearchGate](https://www.researchgate.net) (after forum announcement; download the ZIP file of the new release from Zenodo and add it as research item via the **code** category, be sure to include the corresponding new Zenodo DOI)
5658
- [ ] Update release checklist template with any additional bullet points that may have arisen during the release
5759

5860
---

.github/workflows/check-links.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
--exclude "^https://hackmd.io/@pygmt"
6464
--exclude "^https://test.pypi.org/simple/"
6565
--exclude "^https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf"
66+
--exclude "^https://naciscdn.org/naturalearth"
6667
--exclude "^https://www.generic-mapping-tools.org/remote-datasets/%s$"
6768
--exclude "^https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html"
6869
--exclude "^https://www.pygmt.org/%7B%7Bpath%7D%7D"

.github/workflows/ci_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
GH_TOKEN: ${{ github.token }}
152152

153153
- name: Install uv
154-
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
154+
uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
155155
with:
156156
activate-environment: true
157157
python-version: ${{ matrix.python-version }}

.github/workflows/ci_tests_dev.yaml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -103,44 +103,30 @@ jobs:
103103

104104
# Build GMT from source on Linux/macOS, script is adapted from
105105
# https://github.com/GenericMappingTools/gmt/blob/6.5.0/ci/build-gmt.sh
106-
- name: Build GMT on Linux/macOS
107-
run: |
108-
cd gmt/
109-
mkdir build
110-
cd build
111-
cmake -G Ninja .. \
112-
-DCMAKE_INSTALL_PREFIX=${GMT_INSTALL_DIR} \
113-
-DCMAKE_BUILD_TYPE=Release \
114-
-DGMT_ENABLE_OPENMP=TRUE \
115-
-DGMT_USE_THREADS=TRUE
116-
cmake --build .
117-
cmake --build . --target install
118-
cd ..
119-
rm -rf gmt/
120-
env:
121-
GMT_INSTALL_DIR: ${{ runner.temp }}/gmt-install-dir
122-
if: runner.os != 'Windows'
123-
124-
- name: Build GMT on Windows
106+
- name: Build GMT from source
125107
shell: bash
126108
run: |
127109
cd gmt/
128110
mkdir build
129111
cd build
130-
cmd.exe /c "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
112+
if [[ "$RUNNER_OS" == "Windows" ]]; then
113+
cmd.exe /c "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
114+
CMAKE_PREFIX_PATH="$MAMBA_ROOT_PREFIX/envs/pygmt/Library"
115+
else
116+
CMAKE_PREFIX_PATH="$MAMBA_ROOT_PREFIX/envs/pygmt"
117+
fi
131118
cmake -G Ninja .. \
119+
-DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" \
132120
-DCMAKE_INSTALL_PREFIX="$GMT_INSTALL_DIR" \
133121
-DCMAKE_BUILD_TYPE=Release \
134-
-DCMAKE_PREFIX_PATH="$MAMBA_ROOT_PREFIX/envs/pygmt/Library" \
135122
-DGMT_ENABLE_OPENMP=TRUE \
136123
-DGMT_USE_THREADS=TRUE
137124
cmake --build .
138125
cmake --build . --target install
139126
cd ..
140-
rm -rf gmt/
127+
rm -rf build
141128
env:
142129
GMT_INSTALL_DIR: ${{ runner.temp }}/gmt-install-dir
143-
if: runner.os == 'Windows'
144130

145131
- name: Add GMT's bin to PATH
146132
run: echo '${{ runner.temp }}/gmt-install-dir/bin' >> $GITHUB_PATH

.github/workflows/format-command.yml

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

3434
# Setup Python environment
3535
- name: Set up Python and install dependencies
36-
uses: actions/setup-python@v6.1.0
36+
uses: actions/setup-python@v6.2.0
3737
with:
3838
python-version: '3.14'
3939
pip-install: ruff prek

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
persist-credentials: false
5151

5252
- name: Set up Python and install dependencies
53-
uses: actions/setup-python@v6.1.0
53+
uses: actions/setup-python@v6.2.0
5454
with:
5555
python-version: '3.14'
5656
pip-install: build

.github/workflows/release-drafter.yml

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

2424
steps:
2525
# Drafts your next Release notes as Pull Requests are merged into "main"
26-
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
26+
- uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6.2.0
2727
with:
2828
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
2929
config-name: release-drafter.yml

.github/workflows/style_checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
persist-credentials: false
3232

3333
- name: Set up Python and install dependencies
34-
uses: actions/setup-python@v6.1.0
34+
uses: actions/setup-python@v6.2.0
3535
with:
3636
python-version: '3.14'
3737
pip-install: ruff prek

.github/workflows/type_checks.yml

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

4242
# Setup Python
4343
- name: Set up Python
44-
uses: actions/setup-python@v6.1.0
44+
uses: actions/setup-python@v6.2.0
4545
with:
4646
python-version: '3.14'
4747
# Need to install following packages:

.mailmap

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
# Map author/committer names and/or email addresses for git.
22
# Reference: https://git-scm.com/docs/gitmailmap
3+
4+
# Canonical identities: "Canonical Name <Canonical Email>"
35
Dongdong Tian <seisman.info@gmail.com>
4-
Dongdong Tian <seisman.info@gmail.com> <seisman@users.noreply.github.com>
56
Jiayuan Yao <coreman.seism@gmail.com>
6-
Jiayuan Yao <coreman.seism@gmail.com> <core-man@users.noreply.github.com>
77
Jing-Hui Tong <86273921+JingHuiTong@users.noreply.github.com>
8-
Jing-Hui Tong <86273921+JingHuiTong@users.noreply.github.com> <r0922422020@g.ntu.edu.tw>
98
Max Jones <14077947+maxrjones@users.noreply.github.com>
9+
Michael Grund <23025878+michaelgrund@users.noreply.github.com>
10+
Wei Ji Leong <23487320+weiji14@users.noreply.github.com>
11+
Will Schlitzer <schlitzer90@gmail.com>
12+
Xingchen He <chuanjun@stu.cdut.edu.cn>
13+
Yvonne Fröhlich <94163266+yvonnefroehlich@users.noreply.github.com>
14+
15+
# Alias mappings: "Canonical Name <Canonical Email> <Alias Email>"
16+
Dongdong Tian <seisman.info@gmail.com> <seisman@users.noreply.github.com>
17+
Jiayuan Yao <coreman.seism@gmail.com> <core-man@users.noreply.github.com>
18+
Jing-Hui Tong <86273921+JingHuiTong@users.noreply.github.com> <r0922422020@g.ntu.edu.tw>
1019
Max Jones <14077947+maxrjones@users.noreply.github.com> <meghanj@alum.mit.edu>
1120
Max Jones <14077947+maxrjones@users.noreply.github.com> <meghanj@hawaii.edu>
1221
Max Jones <14077947+maxrjones@users.noreply.github.com> <meghanrjones@users.noreply.github.com>
13-
Michael Grund <michael_grund@gmx.de> <23025878+michaelgrund@users.noreply.github.com>
14-
Michael Grund <michael_grund@gmx.de> <michael.grund@kit.edu>
15-
Michael Grund <michael_grund@gmx.de> <michaelgrund@users.noreply.github.com>
16-
Wei Ji Leong <23487320+weiji14@users.noreply.github.com>
22+
Michael Grund <23025878+michaelgrund@users.noreply.github.com> <michael_grund@gmx.de>
23+
Michael Grund <23025878+michaelgrund@users.noreply.github.com> <michael.grund@kit.edu>
24+
Michael Grund <23025878+michaelgrund@users.noreply.github.com> <michaelgrund@users.noreply.github.com>
1725
Wei Ji Leong <23487320+weiji14@users.noreply.github.com> <weiji.leong@vuw.ac.nz>
1826
Wei Ji Leong <23487320+weiji14@users.noreply.github.com> <weiji14@users.noreply.github.com>
1927
Will Schlitzer <schlitzer90@gmail.com> <willschlitzer@users.noreply.github.com>
28+
Xingchen He <chuanjun@stu.cdut.edu.cn> <chuanjun1978@gmail.com>
2029
Yvonne Fröhlich <94163266+yvonnefroehlich@users.noreply.github.com> <yvonne.froehlich@kit.edu>
2130
Yvonne Fröhlich <94163266+yvonnefroehlich@users.noreply.github.com> <yfroe@gpiseis16.gpi.kit.edu>

0 commit comments

Comments
 (0)