Skip to content

Commit ce018ac

Browse files
committed
Merge branch 'main' into paragraph/wysiwyg
2 parents 2b303ab + 346c9bf commit ce018ac

52 files changed

Lines changed: 316 additions & 199 deletions

Some content is hidden

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

.github/release-drafter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ exclude-labels:
2222
- 'skip-changelog'
2323
exclude-contributors:
2424
- 'actions-bot'
25+
- 'Copilot'
26+
- 'copilot-swe-agent[bot]'
2527
- 'dependabot'
2628
- 'dependabot[bot]'
2729
category-template: '### $TITLE'

.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@d872884a306dd4853acf0f584f4b706cf0cc72a2 # v4.13.0
87+
uses: CodSpeedHQ/action@3194d9a39c4d46684cb44bf7207fc56626aad8fd # v4.15.1
8888
with:
8989
mode: "instrumentation"
9090
# 'bash -el -c' is needed to use the custom shell.

.github/workflows/cache_data.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ on:
2727

2828
permissions: {}
2929

30+
concurrency:
31+
group: ${{ github.workflow }}-${{ github.ref }}
32+
cancel-in-progress: true
33+
3034
jobs:
3135
gmt_cache:
3236
name: Cache GMT artifacts
33-
runs-on: macos-slim
37+
runs-on: ubuntu-slim
3438
defaults:
3539
run:
3640
shell: bash -l {0}

.github/workflows/ci_docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
create-args: >-
9494
python=3.14
9595
gmt=6.6.0
96-
ghostscript=10.07.0
96+
ghostscript=10.07.1
9797
numpy
9898
pandas
9999
xarray
@@ -116,7 +116,7 @@ jobs:
116116
sphinx_rtd_theme
117117
cairosvg
118118
sphinxcontrib-svg2pdfconverter
119-
tectonic
119+
tectonic=0.15
120120
121121
# Download cached remote files (artifacts) from GitHub
122122
- name: Download remote data from GitHub

.github/workflows/ci_tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ jobs:
7575
include:
7676
# Python 3.12 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
7777
- python-version: '3.12'
78-
numpy-version: '2.0'
79-
pandas-version: '=2.2'
80-
xarray-version: '=2024.5'
78+
numpy-version: '2.1'
79+
pandas-version: '=2.3'
80+
xarray-version: '=2024.7'
8181
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray netCDF4 sphinx-gallery'
8282
# Python 3.14 + core packages (latest versions) + optional packages
8383
- python-version: '3.14'
@@ -128,7 +128,7 @@ jobs:
128128
create-args: >-
129129
python=${{ matrix.python-version }}${{ matrix.optional-packages }}
130130
gmt=6.6.0
131-
ghostscript=10.07.0
131+
ghostscript=10.07.1
132132
numpy=${{ matrix.numpy-version }}
133133
pandas${{ matrix.pandas-version }}
134134
xarray${{ matrix.xarray-version }}
@@ -154,7 +154,7 @@ jobs:
154154
GH_TOKEN: ${{ github.token }}
155155

156156
- name: Install uv
157-
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
157+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
158158
with:
159159
activate-environment: true
160160
python-version: ${{ matrix.python-version }}

.github/workflows/ci_tests_dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
ninja
7575
curl
7676
fftw
77-
ghostscript=10.07.0
77+
ghostscript=10.07.1
7878
glib
7979
hdf5
8080
libblas

.github/workflows/ci_tests_legacy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ jobs:
6161
python=3.12
6262
gmt=${{ matrix.gmt_version }}
6363
ghostscript
64-
numpy=2.0
65-
pandas=2.2
66-
xarray=2024.5
64+
numpy=2.1
65+
pandas=2.3
66+
xarray=2024.7
6767
packaging=24.2
6868
contextily=1.5
6969
geopandas=1.0

.github/workflows/dvc-diff.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737

3838
- name: Setup continuous machine learning (CML)
3939
uses: iterative/setup-cml@1b5ab8766e715e8f1aab96bbb1f4f2e3e1e8af45 # v3
40+
with:
41+
vega: false
4042

4143
# Produce the markdown diff report, which should look like:
4244
# ## Summary of changed images
@@ -59,6 +61,7 @@ jobs:
5961
- name: Generate the image diff report
6062
env:
6163
REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64+
PR_BASE_REF: ${{ github.event.pull_request.base.ref }}
6265
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
6366
DAGSHUB_TOKEN: ${{ secrets.DAGSHUB_TOKEN }}
6467
run: |
@@ -70,7 +73,7 @@ jobs:
7073
7174
# Pull image data from cloud storage
7275
dvc pull --remote upstream
73-
dvc diff --md main HEAD >> report.md
76+
dvc diff --md "${PR_BASE_REF}" HEAD >> report.md
7477
7578
# Get just the filename of the added and modified image from the report
7679
awk 'NF==5 && NR>=7 && $2=="added" {print $4}' report.md > added_files.txt
@@ -79,8 +82,8 @@ jobs:
7982
# Backup new images in the baseline-new directory
8083
mkdir pygmt/tests/baseline-new
8184
cp pygmt/tests/baseline/*.png pygmt/tests/baseline-new/
82-
# Pull images in the main branch from cloud storage
83-
git checkout main
85+
# Pull images in the PR base branch from cloud storage
86+
git checkout "${PR_BASE_REF}"
8487
dvc pull --remote upstream --force
8588
8689
# Append each image to the markdown report

.github/workflows/format-command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
runs-on: ubuntu-slim
1919
steps:
2020
# Generate token from GenericMappingTools bot
21-
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
21+
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
2222
id: generate-token
2323
with:
24-
app-id: ${{ secrets.APP_ID }}
24+
client-id: ${{ vars.CLIENT_ID }}
2525
private-key: ${{ secrets.APP_PRIVATE_KEY }}
2626

2727
# Checkout the pull request branch

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
if: github.repository == 'GenericMappingTools/pygmt'
2121

2222
steps:
23-
- uses: release-drafter/release-drafter@5de93583980a40bd78603b6dfdcda5b4df377b32 # v7.2.0
23+
- uses: release-drafter/release-drafter@563bf132657a13ded0b01fcb723c5a58cdd824e2 # v7.2.1
2424
with:
2525
config-name: release-drafter.yml

0 commit comments

Comments
 (0)