Skip to content

Commit 03e2269

Browse files
committed
Merge branch 'main' into alias-system
2 parents 484ecc0 + 1256d15 commit 03e2269

File tree

85 files changed

+1724
-369
lines changed

Some content is hidden

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

85 files changed

+1724
-369
lines changed

.github/ISSUE_TEMPLATE/4-release_checklist.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: PyGMT release checklist
3-
about: Checklist for a new PyGMT release.
3+
about: Checklist for a new PyGMT release. [For project maintainers only!]
44
title: Release PyGMT vX.Y.Z
55
labels: maintenance
66
assignees: ''
@@ -23,7 +23,7 @@ assignees: ''
2323
core package dependencies (NumPy, pandas, Xarray)
2424
- [ ] Review the ["PyGMT Team" page](https://www.pygmt.org/dev/team.html)
2525
- [ ] Check to ensure that:
26-
- [ ] Deprecations and related tests are removed for this version by running `grep --include="*.py" -r vX.Y.Z` from the base of the repository
26+
- [ ] Deprecated workarounds/codes/tests are removed. Run `grep "# TODO" **/*.py` to find all potential TODOs.
2727
- [ ] All tests pass in the ["GMT Legacy Tests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_legacy.yaml)
2828
- [ ] All tests pass in the ["GMT Dev Tests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_dev.yaml)
2929
- [ ] All tests pass in the ["Doctests" workflow](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_doctests.yaml)

.github/ISSUE_TEMPLATE/5-bump_gmt_checklist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Bump GMT version checklist
3-
about: Checklist for bumping the minimum required GMT version.
3+
about: Checklist for bumping the minimum required GMT version. [For project maintainers only!]
44
title: Bump to GMT X.Y.Z
55
labels: maintenance
66
assignees: ''

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Fixes #
2020
- [ ] Write detailed docstrings for all functions/methods.
2121
- [ ] If wrapping a new module, open a 'Wrap new GMT module' issue and submit reasonably-sized PRs.
2222
- [ ] If adding new functionality, add an example to docstrings or tutorials.
23-
- [ ] Use underscores (not hyphens) in names of Python files and directories.
2423

2524
**Slash Commands**
2625

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Install Micromamba with conda-forge dependencies
4747
- name: Setup Micromamba
48-
uses: mamba-org/[email protected].2
48+
uses: mamba-org/[email protected].3
4949
with:
5050
environment-name: pygmt
5151
condarc: |
@@ -58,14 +58,14 @@ jobs:
5858
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
5959
create-args: >-
6060
gmt=6.5.0
61-
python=3.12
61+
python=3.13
6262
numpy
6363
pandas
6464
xarray
6565
netCDF4
6666
packaging
6767
geopandas
68-
pyarrow
68+
pyarrow-core
6969
pytest
7070
pytest-codspeed
7171
pytest-mpl

.github/workflows/cache_data.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ jobs:
4343

4444
# Install Micromamba with conda-forge dependencies
4545
- name: Setup Micromamba
46-
uses: mamba-org/[email protected].2
46+
uses: mamba-org/[email protected].3
4747
with:
4848
environment-name: pygmt
4949
condarc: |
5050
channels:
5151
- conda-forge
5252
- nodefaults
5353
create-args: >-
54-
python=3.12
54+
python=3.13
5555
gmt=6.5.0
5656
numpy
5757
pandas

.github/workflows/ci_docs.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# Is it a draft Pull Request (true or false)?
5656
isDraft:
5757
- ${{ github.event.pull_request.draft }}
58-
# Only run one job (Ubuntu + Python 3.12) for draft PRs
58+
# Only run jobs on Ubuntu for draft PRs
5959
exclude:
6060
- os: macos-latest
6161
isDraft: true
@@ -80,7 +80,7 @@ jobs:
8080

8181
# Install Micromamba with conda-forge dependencies
8282
- name: Setup Micromamba
83-
uses: mamba-org/[email protected].2
83+
uses: mamba-org/[email protected].3
8484
with:
8585
environment-name: pygmt
8686
condarc: |
@@ -92,7 +92,7 @@ jobs:
9292
# environment cache is persistent for one week.
9393
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
9494
create-args: >-
95-
python=3.12
95+
python=3.13
9696
gmt=6.5.0
9797
ghostscript=10.04.0
9898
numpy
@@ -103,11 +103,12 @@ jobs:
103103
contextily
104104
geopandas
105105
ipython
106-
pyarrow
106+
pyarrow-core
107107
rioxarray
108108
make
109109
pip
110110
python-build
111+
geodatasets
111112
myst-nb
112113
panel
113114
sphinx>=6.2

.github/workflows/ci_doctests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ jobs:
4242

4343
# Install Micromamba with conda-forge dependencies
4444
- name: Setup Micromamba
45-
uses: mamba-org/[email protected].2
45+
uses: mamba-org/[email protected].3
4646
with:
4747
environment-name: pygmt
4848
condarc: |
4949
channels:
5050
- conda-forge
5151
- nodefaults
5252
create-args: >-
53-
python=3.12
53+
python=3.13
5454
gmt=6.5.0
5555
numpy
5656
pandas
@@ -60,7 +60,7 @@ jobs:
6060
contextily
6161
geopandas
6262
ipython
63-
pyarrow
63+
pyarrow-core
6464
rioxarray
6565
make
6666
pip

.github/workflows/ci_tests.yaml

Lines changed: 26 additions & 15 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.10', '3.12']
59+
python-version: ['3.11', '3.13']
6060
os: [ubuntu-latest, macos-latest, windows-latest]
6161
# Is it a draft Pull Request (true or false)?
6262
isDraft:
@@ -68,21 +68,21 @@ jobs:
6868
- os: windows-latest
6969
isDraft: true
7070
include:
71-
# Python 3.10 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
72-
- python-version: '3.10'
73-
numpy-version: '1.24'
71+
# Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
72+
- python-version: '3.11'
73+
numpy-version: '1.25'
7474
pandas-version: '=2.0'
7575
xarray-version: '=2023.04'
76-
optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery'
77-
# Python 3.12 + core packages (latest versions) + optional packages
78-
- python-version: '3.12'
79-
numpy-version: '2.1'
76+
optional-packages: ' contextily geopandas<1 ipython pyarrow-core rioxarray sphinx-gallery'
77+
# Python 3.13 + core packages (latest versions) + optional packages
78+
- python-version: '3.13'
79+
numpy-version: '2.2'
8080
pandas-version: ''
8181
xarray-version: ''
82-
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery'
83-
# Python 3.11 + core packages (Linux only)
82+
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow-core rioxarray sphinx-gallery'
83+
# Python 3.12 + core packages (Linux only)
8484
- os: 'ubuntu-latest'
85-
python-version: '3.11'
85+
python-version: '3.12'
8686
numpy-version: ''
8787
pandas-version: ''
8888
xarray-version: ''
@@ -113,7 +113,7 @@ jobs:
113113

114114
# Install Micromamba with conda-forge dependencies
115115
- name: Setup Micromamba
116-
uses: mamba-org/[email protected].2
116+
uses: mamba-org/[email protected].3
117117
with:
118118
environment-name: pygmt
119119
condarc: |
@@ -133,7 +133,6 @@ jobs:
133133
xarray${{ matrix.xarray-version }}
134134
netCDF4
135135
packaging
136-
dvc
137136
make
138137
pip
139138
python-build
@@ -154,9 +153,21 @@ jobs:
154153
env:
155154
GH_TOKEN: ${{ github.token }}
156155

156+
- name: Install uv
157+
uses: astral-sh/[email protected]
158+
159+
- name: Install dvc
160+
run: |
161+
uv venv
162+
source .venv/bin/activate
163+
uv pip install dvc
164+
uv pip list
165+
157166
# Pull baseline image data from dvc remote (DAGsHub)
158167
- name: Pull baseline image data from dvc remote
159-
run: dvc pull --no-run-cache --verbose && ls -lhR pygmt/tests/baseline/
168+
run: |
169+
source .venv/bin/activate
170+
uv run dvc pull --no-run-cache --verbose && ls -lhR pygmt/tests/baseline/
160171
161172
# Install the package that we want to test
162173
- name: Install the package
@@ -176,7 +187,7 @@ jobs:
176187

177188
# Upload coverage to Codecov
178189
- name: Upload coverage to Codecov
179-
uses: codecov/codecov-action@v5.0.7
190+
uses: codecov/codecov-action@v5.1.2
180191
if: success() || failure()
181192
with:
182193
use_oidc: true

.github/workflows/ci_tests_dev.yaml

Lines changed: 3 additions & 3 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-24.04, macos-15, windows-2022]
39+
os: [ubuntu-24.04, macos-15, windows-2025]
4040
gmt_git_ref: [master]
4141
timeout-minutes: 30
4242
defaults:
@@ -57,7 +57,7 @@ jobs:
5757

5858
# Install Micromamba with conda-forge dependencies
5959
- name: Setup Micromamba
60-
uses: mamba-org/[email protected].2
60+
uses: mamba-org/[email protected].3
6161
with:
6262
environment-name: pygmt
6363
condarc: |
@@ -69,7 +69,7 @@ jobs:
6969
# environment cache is persistent for one week.
7070
cache-environment-key: micromamba-environment-${{ steps.date.outputs.date }}
7171
create-args: >-
72-
python=3.12
72+
python=3.13
7373
cmake
7474
make
7575
ninja

.github/workflows/ci_tests_legacy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ jobs:
5151

5252
# Install Micromamba with conda-forge dependencies
5353
- name: Setup Micromamba
54-
uses: mamba-org/[email protected].2
54+
uses: mamba-org/[email protected].3
5555
with:
5656
environment-name: pygmt
5757
condarc: |
5858
channels:
5959
- conda-forge
6060
- nodefaults
6161
create-args: >-
62-
python=3.10
62+
python=3.11
6363
gmt=${{ matrix.gmt_version }}
6464
ghostscript<10
6565
numpy<2
@@ -70,7 +70,7 @@ jobs:
7070
contextily
7171
geopandas
7272
ipython
73-
pyarrow
73+
pyarrow-core
7474
rioxarray
7575
sphinx-gallery
7676
make

0 commit comments

Comments
 (0)