Skip to content

Commit 50e297a

Browse files
committed
Merge branch 'main' into AliasSystem/params/frame
2 parents 2714319 + b243fef commit 50e297a

File tree

194 files changed

+3124
-1871
lines changed

Some content is hidden

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

194 files changed

+3124
-1871
lines changed

.github/ISSUE_TEMPLATE/3-module_request.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ labels: ["feature request"]
1414
- GMT.jl: https://www.generic-mapping-tools.org/GMTjl_doc/documentation/modules/<module>
1515
- PyGMT: https://www.pygmt.org/dev/api/generated/<wrapper>.html
1616

17-
## GMT Option Flags and Modifieres
17+
## GMT Option Flags and Modifiers
1818

1919
☑️: *Implemented*; ⬜: *To be implemented/discussed*; ~~Strikethrough~~: *Won't implement*.
2020

21-
- [ ] `-R`: `region` #XXX @XXX
22-
- [ ] `-J`: `projection` #XXX @XXX
21+
- [ ] `-B`: `frame`
22+
- [ ] `-J`: `projection`
23+
- [ ] `-R`: `region`
2324
- [ ] ...
2425
- [ ] ~~`-U`~~: Use `Figure.timestamp` instead.
26+
- [ ] `-V`: `verbose`
2527
- [ ] ~~`-X`/`-Y`~~: Use `Figure.shift_origin` instead.
2628
- [ ] ~~`--PAR=value`~~: Use `pygmt.config` instead.
2729

@@ -31,7 +33,7 @@ labels: ["feature request"]
3133

3234
## Linked Pull Requests
3335

34-
- [ ] Initial feature implementation #XXX @XXX
36+
- [ ] Initial feature implementation
3537
- [ ] Add a tutorial or gallery example
3638

3739
## Related Issues and Discussions

.github/ISSUE_TEMPLATE/5-bump_gmt_checklist.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ mamba install -c conda-forge gmt=X.Y.Z
3131
- [ ] Run `grep -r "# TODO(GMT.*)" --include="*.py" .` to find TODO items related to GMT
3232
- [ ] Remove related workarounds/patches
3333
- [ ] Fix tests with pytest `xfail`/`skipif` markers that now pass
34+
- [ ] Update URLs to manually inserted images of the GMT documentation
3435
- [ ] Update this checklist if necessary
3536

3637
**To-Do for bumping the minimum required GMT version**:

.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: 3 additions & 3 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/checkout@v5.0.0
39+
uses: actions/checkout@v6.0.1
4040
with:
4141
# fetch all history so that setuptools-scm works
4242
fetch-depth: 0
@@ -56,7 +56,7 @@ jobs:
5656
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
5757
create-args: >-
5858
gmt=6.6.0
59-
python=3.13
59+
python=3.14
6060
numpy
6161
pandas
6262
xarray
@@ -84,7 +84,7 @@ jobs:
8484

8585
# Run the benchmark tests
8686
- name: Run benchmarks
87-
uses: CodSpeedHQ/action@6a8e2b874c338bf81cc5e8be715ada75908d3871 # v4.3.4
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
steps:
3939
# Checkout current git repository
4040
- name: Checkout
41-
uses: actions/checkout@v5.0.0
41+
uses: actions/checkout@v6.0.1
4242
with:
4343
# fetch all history so that setuptools-scm works
4444
fetch-depth: 0
@@ -50,7 +50,7 @@ jobs:
5050
with:
5151
environment-name: pygmt
5252
create-args: >-
53-
python=3.13
53+
python=3.14
5454
gmt=6.6.0
5555
numpy
5656
pandas
@@ -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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v5.0.0
38+
uses: actions/checkout@v6.0.1
3939
with:
4040
# fetch all history so that setuptools-scm works
4141
fetch-depth: 0
@@ -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/check-links.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626

2727
steps:
2828
- name: Checkout the repository
29-
uses: actions/checkout@v5.0.0
29+
uses: actions/checkout@v6.0.1
3030
with:
3131
path: repository
3232
persist-credentials: false
3333

3434
- name: Checkout the documentation
35-
uses: actions/checkout@v5.0.0
35+
uses: actions/checkout@v6.0.1
3636
with:
3737
ref: gh-pages
3838
path: documentation

.github/workflows/ci_docs.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
steps:
7373
# Checkout current git repository
7474
- name: Checkout
75-
uses: actions/checkout@v5.0.0
75+
uses: actions/checkout@v6.0.1
7676
with:
7777
# fetch all history so that setuptools-scm works
7878
fetch-depth: 0
@@ -91,7 +91,7 @@ jobs:
9191
# environment cache is persistent for one week.
9292
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
9393
create-args: >-
94-
python=3.13
94+
python=3.14
9595
gmt=6.6.0
9696
ghostscript=10.06.0
9797
numpy
@@ -106,7 +106,6 @@ jobs:
106106
make
107107
pip
108108
python-build
109-
geodatasets
110109
myst-nb
111110
panel
112111
sphinx>=6.2
@@ -151,7 +150,7 @@ jobs:
151150
cd ../..
152151
153152
- name: Upload PDF as artifact for previewing on pull requests
154-
uses: actions/upload-artifact@v5.0.0
153+
uses: actions/upload-artifact@v6.0.0
155154
if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
156155
with:
157156
name: artifact-pygmt-docs-pdf
@@ -169,7 +168,7 @@ jobs:
169168
REF_NAME: ${{ github.ref_name }}
170169

171170
- name: Checkout the gh-pages branch
172-
uses: actions/checkout@v5.0.0
171+
uses: actions/checkout@v6.0.1
173172
with:
174173
ref: gh-pages
175174
# Checkout to this folder instead of the current one

.github/workflows/ci_doctests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838
# Checkout current git repository
3939
- name: Checkout
40-
uses: actions/checkout@v5.0.0
40+
uses: actions/checkout@v6.0.1
4141
with:
4242
# fetch all history so that setuptools-scm works
4343
fetch-depth: 0
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
environment-name: pygmt
5151
create-args: >-
52-
python=3.13
52+
python=3.14
5353
gmt=6.6.0
5454
numpy
5555
pandas

.github/workflows/ci_tests.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
python-version: ['3.11', '3.13']
59+
python-version: ['3.12', '3.14']
6060
os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest]
6161
# Is it a draft Pull Request (true or false)?
6262
isDraft:
@@ -70,21 +70,21 @@ jobs:
7070
- os: windows-latest
7171
isDraft: true
7272
include:
73-
# Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
74-
- python-version: '3.11'
73+
# Python 3.12 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
74+
- python-version: '3.12'
7575
numpy-version: '2.0'
7676
pandas-version: '=2.2'
7777
xarray-version: '=2024.5'
7878
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray netCDF4 sphinx-gallery'
79-
# Python 3.13 + core packages (latest versions) + optional packages
80-
- python-version: '3.13'
81-
numpy-version: '2.3'
79+
# Python 3.14 + core packages (latest versions) + optional packages
80+
- python-version: '3.14'
81+
numpy-version: '2.4'
8282
pandas-version: ''
8383
xarray-version: ''
8484
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray netCDF4 sphinx-gallery'
85-
# Python 3.12 + core packages (Linux only)
85+
# Python 3.13 + core packages (Linux only)
8686
- os: 'ubuntu-latest'
87-
python-version: '3.12'
87+
python-version: '3.13'
8888
numpy-version: ''
8989
pandas-version: ''
9090
xarray-version: ''
@@ -104,7 +104,7 @@ jobs:
104104
steps:
105105
# Checkout current git repository
106106
- name: Checkout
107-
uses: actions/checkout@v5.0.0
107+
uses: actions/checkout@v6.0.1
108108
with:
109109
# fetch all history so that setuptools-scm works
110110
fetch-depth: 0
@@ -151,7 +151,7 @@ jobs:
151151
GH_TOKEN: ${{ github.token }}
152152

153153
- name: Install uv
154-
uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
154+
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
155155
with:
156156
activate-environment: true
157157
python-version: ${{ matrix.python-version }}
@@ -190,15 +190,15 @@ 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 }}
197197
path: tmp-test-dir-with-unique-name
198198

199199
# Upload coverage to Codecov
200200
- name: Upload coverage to Codecov
201-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
201+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
202202
if: success() || failure()
203203
with:
204204
use_oidc: true

0 commit comments

Comments
 (0)