Skip to content

Commit 47eaad8

Browse files
committed
Merge branch 'main' into python-3.13
2 parents 40545a0 + ff9daae commit 47eaad8

Some content is hidden

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

71 files changed

+1294
-801
lines changed

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525

2626
jobs:
2727
benchmarks:
28-
runs-on: ubuntu-22.04
28+
runs-on: ubuntu-latest
2929
if: github.repository == 'GenericMappingTools/pygmt' && (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run/benchmark'))
3030
defaults:
3131
run:
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
# Checkout current git repository
3636
- name: Checkout
37-
uses: actions/[email protected].1
37+
uses: actions/[email protected].2
3838
with:
3939
# fetch all history so that setuptools-scm works
4040
fetch-depth: 0
@@ -88,7 +88,7 @@ jobs:
8888

8989
# Run the benchmark tests
9090
- name: Run benchmarks
91-
uses: CodSpeedHQ/action@v3.0.1
91+
uses: CodSpeedHQ/action@v3.1.0
9292
with:
9393
# 'bash -el -c' is needed to use the custom shell.
9494
# See https://github.com/CodSpeedHQ/action/issues/65.

.github/workflows/cache_data.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
# Checkout current git repository
3838
- name: Checkout
39-
uses: actions/[email protected].1
39+
uses: actions/[email protected].2
4040
with:
4141
# fetch all history so that setuptools-scm works
4242
fetch-depth: 0
@@ -76,7 +76,7 @@ jobs:
7676

7777
# Upload the downloaded files as artifacts to GitHub
7878
- name: Upload artifacts to GitHub
79-
uses: actions/[email protected].0
79+
uses: actions/[email protected].3
8080
with:
8181
name: gmt-cache
8282
include-hidden-files: true

.github/workflows/check-links.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323

2424
steps:
2525
- name: Checkout the repository
26-
uses: actions/[email protected].1
26+
uses: actions/[email protected].2
2727
with:
2828
path: repository
2929

3030
- name: Checkout the documentation
31-
uses: actions/[email protected].1
31+
uses: actions/[email protected].2
3232
with:
3333
ref: gh-pages
3434
path: documentation

.github/workflows/ci_docs.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
steps:
7070
# Checkout current git repository
7171
- name: Checkout
72-
uses: actions/[email protected].1
72+
uses: actions/[email protected].2
7373
with:
7474
# fetch all history so that setuptools-scm works
7575
fetch-depth: 0
@@ -104,6 +104,7 @@ jobs:
104104
contextily
105105
geopandas<1.0
106106
ipython
107+
pyarrow
107108
rioxarray
108109
make
109110
pip
@@ -115,7 +116,7 @@ jobs:
115116
sphinx-copybutton
116117
sphinx-design
117118
sphinx-gallery
118-
sphinx_rtd_theme
119+
sphinx_rtd_theme<3.0
119120
120121
# Download cached remote files (artifacts) from GitHub
121122
- name: Download remote data from GitHub
@@ -139,7 +140,7 @@ jobs:
139140
run: make -C doc clean all
140141

141142
- name: Checkout the gh-pages branch
142-
uses: actions/[email protected].1
143+
uses: actions/[email protected].2
143144
with:
144145
ref: gh-pages
145146
# Checkout to this folder instead of the current one

.github/workflows/ci_doctests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
# Checkout current git repository
3737
- name: Checkout
38-
uses: actions/[email protected].1
38+
uses: actions/[email protected].2
3939
with:
4040
# fetch all history so that setuptools-scm works
4141
fetch-depth: 0

.github/workflows/ci_tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ jobs:
8585
- os: 'ubuntu-latest'
8686
python-version: '3.11' # Can't be 3.10 or 3.13.
8787
numpy-version: '1.24'
88-
pandas-version: ''
88+
pandas-version: '=2.1'
8989
xarray-version: ''
90-
optional-packages: ' geopandas<1'
90+
optional-packages: ' geopandas<1 pyarrow'
9191

9292
timeout-minutes: 30
9393
defaults:
@@ -103,7 +103,7 @@ jobs:
103103
steps:
104104
# Checkout current git repository
105105
- name: Checkout
106-
uses: actions/[email protected].1
106+
uses: actions/[email protected].2
107107
with:
108108
# fetch all history so that setuptools-scm works
109109
fetch-depth: 0
@@ -171,7 +171,7 @@ jobs:
171171

172172
# Upload diff images on test failure
173173
- name: Upload diff images if any test fails
174-
uses: actions/[email protected].0
174+
uses: actions/[email protected].3
175175
if: failure()
176176
with:
177177
name: artifact-${{ runner.os }}-${{ matrix.python-version }}

.github/workflows/ci_tests_dev.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
# Checkout current git repository
4848
- name: Checkout
49-
uses: actions/[email protected].1
49+
uses: actions/[email protected].2
5050
with:
5151
# fetch all history so that setuptools-scm works
5252
fetch-depth: 0
@@ -87,9 +87,17 @@ jobs:
8787
pcre
8888
zlib
8989
90+
# Install the GSHHG and DCW datasets on Linux/macOS to avoid corrupted files
91+
# during GMT auto-downloading. Currently, we can't install them on Windows CI,
92+
# because the Windows CI fails to compile "gshhg_version.c" due to unknown reasons
93+
# (likely missing DLLs).
94+
- name: Install GMT GSHHG and DCW datasets (Linux/macOS)
95+
run: micromamba install dcw-gmt gshhg-gmt
96+
if: runner.os != 'Windows'
97+
9098
# Checkout current GMT repository
9199
- name: Checkout the GMT source from ${{ matrix.gmt_git_ref }} branch
92-
uses: actions/[email protected].1
100+
uses: actions/[email protected].2
93101
with:
94102
repository: 'GenericMappingTools/gmt'
95103
ref: ${{ matrix.gmt_git_ref }}
@@ -180,7 +188,7 @@ jobs:
180188

181189
# Upload diff images on test failure
182190
- name: Upload diff images if any test fails
183-
uses: actions/[email protected].0
191+
uses: actions/[email protected].3
184192
if: ${{ failure() }}
185193
with:
186194
name: artifact-GMT-${{ matrix.gmt_git_ref }}-${{ runner.os }}

.github/workflows/ci_tests_legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
# Checkout current git repository
4646
- name: Checkout
47-
uses: actions/[email protected].1
47+
uses: actions/[email protected].2
4848
with:
4949
# fetch all history so that setuptools-scm works
5050
fetch-depth: 0

.github/workflows/dvc-diff.yml

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

2222
steps:
2323
- name: Checkout
24-
uses: actions/[email protected].1
24+
uses: actions/[email protected].2
2525
with:
2626
# fetch all history so that dvc diff works
2727
fetch-depth: 0

.github/workflows/format-command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
private-key: ${{ secrets.APP_PRIVATE_KEY }}
1919

2020
# Checkout the pull request branch
21-
- uses: actions/[email protected].1
21+
- uses: actions/[email protected].2
2222
with:
2323
token: ${{ steps.generate-token.outputs.token }}
2424
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
2525
ref: ${{ github.event.client_payload.pull_request.head.ref }}
2626

2727
# Setup Python environment
28-
- uses: actions/setup-python@v5.2.0
28+
- uses: actions/setup-python@v5.3.0
2929
with:
3030
python-version: '3.13'
3131

0 commit comments

Comments
 (0)