Skip to content

Commit 69c28ef

Browse files
committed
Merge branch 'main' into grdview/surftype
2 parents 25af727 + b1737f7 commit 69c28ef

25 files changed

+168
-145
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
22-
- [ ] `-J`: `projection` #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
36+
- [ ] Initial feature implementation
3537
- [ ] Add a tutorial or gallery example
3638

3739
## Related Issues and Discussions

.github/workflows/benchmarks.yml

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/checkout@v5.0.1
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

.github/workflows/cache_data.yaml

Lines changed: 2 additions & 2 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.1
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

.github/workflows/cache_dvc.yaml

Lines changed: 1 addition & 1 deletion
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.1
38+
uses: actions/checkout@v6.0.1
3939
with:
4040
# fetch all history so that setuptools-scm works
4141
fetch-depth: 0

.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.1
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.1
35+
uses: actions/checkout@v6.0.1
3636
with:
3737
ref: gh-pages
3838
path: documentation

.github/workflows/ci_docs.yml

Lines changed: 3 additions & 3 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.1
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
@@ -168,7 +168,7 @@ jobs:
168168
REF_NAME: ${{ github.ref_name }}
169169

170170
- name: Checkout the gh-pages branch
171-
uses: actions/checkout@v5.0.1
171+
uses: actions/checkout@v6.0.1
172172
with:
173173
ref: gh-pages
174174
# 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.1
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: 8 additions & 8 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'
79+
# Python 3.14 + core packages (latest versions) + optional packages
80+
- python-version: '3.14'
8181
numpy-version: '2.3'
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.1
107+
uses: actions/checkout@v6.0.1
108108
with:
109109
# fetch all history so that setuptools-scm works
110110
fetch-depth: 0

.github/workflows/ci_tests_dev.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
steps:
4949
# Checkout current git repository
5050
- name: Checkout
51-
uses: actions/checkout@v5.0.1
51+
uses: actions/checkout@v6.0.1
5252
with:
5353
# fetch all history so that setuptools-scm works
5454
fetch-depth: 0
@@ -67,7 +67,7 @@ jobs:
6767
# environment cache is persistent for one week.
6868
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
6969
create-args: >-
70-
python=3.13
70+
python=3.14
7171
cmake
7272
make
7373
ninja
@@ -94,7 +94,7 @@ jobs:
9494

9595
# Checkout current GMT repository
9696
- name: Checkout the GMT source from ${{ matrix.gmt_git_ref }} branch
97-
uses: actions/checkout@v5.0.1
97+
uses: actions/checkout@v6.0.1
9898
with:
9999
repository: 'GenericMappingTools/gmt'
100100
ref: ${{ matrix.gmt_git_ref }}

.github/workflows/ci_tests_legacy.yaml

Lines changed: 2 additions & 2 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/checkout@v5.0.1
49+
uses: actions/checkout@v6.0.1
5050
with:
5151
# fetch all history so that setuptools-scm works
5252
fetch-depth: 0
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
environment-name: pygmt
6060
create-args: >-
61-
python=3.11
61+
python=3.12
6262
gmt=${{ matrix.gmt_version }}
6363
ghostscript
6464
numpy=2.0

0 commit comments

Comments
 (0)