Skip to content

Commit d98448b

Browse files
committed
Merge branch 'main' into feature/clip
2 parents 9902d2e + 7d12bae commit d98448b

Some content is hidden

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

79 files changed

+508
-419
lines changed

.github/workflows/cache_data.yaml

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

7676
# Upload the downloaded files as artifacts to GitHub
7777
- name: Upload artifacts to GitHub
78-
uses: actions/[email protected].1
78+
uses: actions/[email protected].2
7979
with:
8080
name: gmt-cache
8181
include-hidden-files: true

.github/workflows/check-links.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Check links in the repository and documentation
22
#
3-
# This workflow runs the lychee tool to check all external links in plaintext
4-
# and HTML files. It will create an issue if broken links are found.
3+
# This workflow runs the lychee tool to check all external links in plaintext and HTML
4+
# files. It will create an issue if broken links are found.
55
#
66
# It is scheduled to run weekly at 12 noon every Sunday.
77
#
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Link Checker
4242
id: lychee
43-
uses: lycheeverse/lychee-action@v2.3.0
43+
uses: lycheeverse/lychee-action@v2.4.0
4444
with:
4545
fail: false # Don't fail action on broken links
4646
output: /tmp/lychee-out.md
@@ -76,7 +76,7 @@ jobs:
7676
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
7777

7878
- name: Create Issue From File
79-
if: ${{ steps.lychee.outputs.exit_code }} != 0
79+
if: steps.lychee.outputs.exit_code != 0
8080
run: |
8181
cd repository/
8282
title="Link Checker Report on ${CURRENT_DATE}"

.github/workflows/ci_docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
sphinx-copybutton
115115
sphinx-design
116116
sphinx-gallery
117-
sphinx_rtd_theme<3.0
117+
sphinx_rtd_theme
118118
cairosvg
119119
sphinxcontrib-svg2pdfconverter
120120
tectonic
@@ -151,7 +151,7 @@ jobs:
151151
cd ../..
152152
153153
- name: Upload PDF as artifact for previewing on pull requests
154-
uses: actions/[email protected].1
154+
uses: actions/[email protected].2
155155
if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
156156
with:
157157
name: artifact-pygmt-docs-pdf

.github/workflows/ci_tests.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ jobs:
7272
include:
7373
# Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
7474
- python-version: '3.11'
75-
numpy-version: '1.25'
76-
pandas-version: '=2.0'
77-
xarray-version: '=2023.04'
78-
optional-packages: ' contextily geopandas<1 ipython pyarrow-core rioxarray sphinx-gallery'
75+
numpy-version: '1.26'
76+
pandas-version: '=2.1'
77+
xarray-version: '=2023.07'
78+
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
7979
# Python 3.13 + core packages (latest versions) + optional packages
8080
- python-version: '3.13'
8181
numpy-version: '2.2'
8282
pandas-version: ''
8383
xarray-version: ''
84-
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow-core rioxarray sphinx-gallery'
84+
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
8585
# Python 3.12 + core packages (Linux only)
8686
- os: 'ubuntu-latest'
8787
python-version: '3.12'
@@ -152,7 +152,7 @@ jobs:
152152
GH_TOKEN: ${{ github.token }}
153153

154154
- name: Install uv
155-
uses: astral-sh/[email protected].1
155+
uses: astral-sh/[email protected].2
156156
with:
157157
python-version: ${{ matrix.python-version }}
158158

@@ -175,15 +175,15 @@ jobs:
175175

176176
# Upload diff images on test failure
177177
- name: Upload diff images if any test fails
178-
uses: actions/[email protected].1
178+
uses: actions/[email protected].2
179179
if: failure()
180180
with:
181181
name: artifact-${{ matrix.os }}-${{ matrix.python-version }}
182182
path: tmp-test-dir-with-unique-name
183183

184184
# Upload coverage to Codecov
185185
- name: Upload coverage to Codecov
186-
uses: codecov/[email protected].0
186+
uses: codecov/[email protected].2
187187
if: success() || failure()
188188
with:
189189
use_oidc: true

.github/workflows/ci_tests_dev.yaml

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

187187
# Upload diff images on test failure
188188
- name: Upload diff images if any test fails
189-
uses: actions/[email protected].1
189+
uses: actions/[email protected].2
190190
if: ${{ failure() }}
191191
with:
192192
name: artifact-${{ matrix.os }}-GMT-${{ matrix.gmt_git_ref }}

.github/workflows/ci_tests_legacy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, windows-2019]
39+
os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, windows-2022]
4040
gmt_version: ['6.4']
4141
timeout-minutes: 30
4242
defaults:
@@ -61,15 +61,15 @@ jobs:
6161
python=3.11
6262
gmt=${{ matrix.gmt_version }}
6363
ghostscript<10
64-
numpy<2
64+
numpy=1.26
6565
pandas
6666
xarray
6767
netCDF4
6868
packaging
69-
contextily
70-
geopandas
69+
contextily=1.5
70+
geopandas=1.0
7171
ipython
72-
pyarrow-core
72+
pyarrow-core=16
7373
rioxarray
7474
sphinx-gallery
7575
make

.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
# Generate token from GenericMappingTools bot
19-
- uses: actions/create-github-app-token@v1.12.0
19+
- uses: actions/create-github-app-token@v2.0.2
2020
id: generate-token
2121
with:
2222
app-id: ${{ secrets.APP_ID }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
ls -lh dist/
7575
7676
- name: Store the distribution packages
77-
uses: actions/[email protected].1
77+
uses: actions/[email protected].2
7878
with:
7979
name: python-package-distributions
8080
path: dist/
@@ -93,7 +93,7 @@ jobs:
9393

9494
steps:
9595
- name: Download all the dists
96-
uses: actions/[email protected].0
96+
uses: actions/[email protected].1
9797
with:
9898
name: python-package-distributions
9999
path: dist/
@@ -117,7 +117,7 @@ jobs:
117117

118118
steps:
119119
- name: Download all the dists
120-
uses: actions/[email protected].0
120+
uses: actions/[email protected].1
121121
with:
122122
name: python-package-distributions
123123
path: dist/

.mailmap

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Dongdong Tian <[email protected]>
2+
3+
Jiayuan Yao <[email protected]>
4+
5+
Jing-Hui Tong <[email protected]>
6+
7+
Max Jones <[email protected]>
8+
9+
10+
11+
12+
13+
14+
Wei Ji Leong <[email protected]>
15+
16+
17+
18+
19+

.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/woodruffw/zizmor-pre-commit
19-
rev: v1.5.1
19+
rev: v1.5.2
2020
hooks:
2121
- id: zizmor
2222

0 commit comments

Comments
 (0)