Skip to content

Commit ea367c8

Browse files
seismanseisman
committed
Merge branch 'refactor/virtualfile_in' into refactor/validate_data_input
2 parents 3c61fea + da874d1 commit ea367c8

39 files changed

+424
-293
lines changed

‎.github/ISSUE_TEMPLATE/4-release_checklist.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ assignees: ''
1111
**Scheduled Date**: 20YY/MM/DD
1212
**Pull request due date**: 20YY/MM/DD
1313
**DOI**: `10.5281/zenodo.XXXXXXX`
14+
**Announcement draft**: https://hackmd.io/@pygmt/xxxxxxxx
1415

1516
**Priority PRs/issues to complete prior to release**
1617

@@ -39,11 +40,15 @@ assignees: ''
3940
- [ ] Edit the draft release notes with the finalized changelog
4041
- [ ] Set the tag version and release title to vX.Y.Z
4142
- [ ] Make a release by clicking the 'Publish Release' button, this will automatically create a tag too
43+
- [ ] Verify that [all workflows triggered by the release](https://github.com/GenericMappingTools/pygmt/actions?query=event%3Arelease) pass
44+
- [ ] The latest version is correct on [PyPI](https://pypi.org/project/pygmt/)
45+
- [ ] The latest version is correct on https://www.pygmt.org/latest/
46+
- [ ] The [release page](https://github.com/GenericMappingTools/pygmt/releases) has five assets, including `baseline-images.zip`, `pygmt-docs.zip` and `pygmt-docs.pdf`
4247
- [ ] Download pygmt-X.Y.Z.zip (rename to pygmt-vX.Y.Z.zip) and baseline-images.zip from the release page, and upload the two zip files to https://zenodo.org/deposit, ensure that they are filed under the correct reserved DOI
4348

4449
**After release**:
4550

46-
- [ ] Update conda-forge [pygmt-feedstock](https://github.com/conda-forge/pygmt-feedstock) [Done automatically by conda-forge's bot. Remember to pin GMT, Python and SPEC0 versions]
51+
- [ ] Update conda-forge [pygmt-feedstock](https://github.com/conda-forge/pygmt-feedstock) (Done automatically by conda-forge's bot. If you don't want to wait, open a new issue in the `conda-forge/pygmt-feedstock` repository with the title `@conda-forge-admin, please update version`. This will trigger the bot immediately. Remember to pin GMT, Python and SPEC0 versions)
4752
- [ ] Bump PyGMT version on https://github.com/GenericMappingTools/try-gmt (after conda-forge update)
4853
- [ ] Announce the release on:
4954
- [ ] GMT [forum](https://forum.generic-mapping-tools.org/c/news/) (do this announcement first! Requires moderator status)

‎.github/workflows/cache_data.yaml

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

7676
# Upload the downloaded files as artifacts to GitHub
7777
- name: Upload artifacts to GitHub
78-
uses: actions/[email protected].1
78+
uses: actions/[email protected].2
7979
with:
8080
name: gmt-cache
8181
include-hidden-files: true

‎.github/workflows/check-links.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Check links in the repository and documentation
22
#
3-
# This workflow runs the lychee tool to check all external links in plaintext
4-
# and HTML files. It will create an issue if broken links are found.
3+
# This workflow runs the lychee tool to check all external links in plaintext and HTML
4+
# files. It will create an issue if broken links are found.
55
#
66
# It is scheduled to run weekly at 12 noon every Sunday.
77
#
@@ -66,11 +66,8 @@ jobs:
6666
--exclude "^https://www.pygmt.org/%7B%7Bpath%7D%7D"
6767
--exclude "^https://www.researchgate.net/"
6868
--exclude "^https://zenodo.org/badge/DOI/"
69-
--exclude-path "repository/doc/**/*.rst"
70-
--exclude-path "repository/doc/**/*.md"
7169
--verbose
72-
"repository/**/*.rst"
73-
"repository/**/*.md"
70+
"repository/*.md"
7471
"repository/**/*.py"
7572
"documentation/dev/**/*.html"
7673
@@ -79,7 +76,7 @@ jobs:
7976
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
8077

8178
- name: Create Issue From File
82-
if: ${{ steps.lychee.outputs.exit_code }} != 0
79+
if: steps.lychee.outputs.exit_code != 0
8380
run: |
8481
cd repository/
8582
title="Link Checker Report on ${CURRENT_DATE}"

‎.github/workflows/ci_docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
sphinx-copybutton
115115
sphinx-design
116116
sphinx-gallery
117-
sphinx_rtd_theme<3.0
117+
sphinx_rtd_theme
118118
cairosvg
119119
sphinxcontrib-svg2pdfconverter
120120
tectonic
@@ -151,7 +151,7 @@ jobs:
151151
cd ../..
152152
153153
- name: Upload PDF as artifact for previewing on pull requests
154-
uses: actions/[email protected].1
154+
uses: actions/[email protected].2
155155
if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
156156
with:
157157
name: artifact-pygmt-docs-pdf

‎.github/workflows/ci_tests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ concurrency:
4949

5050
jobs:
5151
test:
52-
name: ${{ matrix.os }} - Python ${{ matrix.python-version }} / NumPy ${{ matrix.numpy-version }}
52+
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
5353
runs-on: ${{ matrix.os }}
5454
permissions:
5555
id-token: write # This is required for requesting OIDC token for codecov
@@ -73,15 +73,15 @@ jobs:
7373
# Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
7474
- python-version: '3.11'
7575
numpy-version: '1.25'
76-
pandas-version: '=2.0'
76+
pandas-version: '=2.1'
7777
xarray-version: '=2023.04'
78-
optional-packages: ' contextily geopandas<1 ipython pyarrow-core rioxarray sphinx-gallery'
78+
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
7979
# Python 3.13 + core packages (latest versions) + optional packages
8080
- python-version: '3.13'
8181
numpy-version: '2.2'
8282
pandas-version: ''
8383
xarray-version: ''
84-
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow-core rioxarray sphinx-gallery'
84+
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
8585
# Python 3.12 + core packages (Linux only)
8686
- os: 'ubuntu-latest'
8787
python-version: '3.12'
@@ -152,7 +152,7 @@ jobs:
152152
GH_TOKEN: ${{ github.token }}
153153

154154
- name: Install uv
155-
uses: astral-sh/[email protected].0
155+
uses: astral-sh/[email protected].1
156156
with:
157157
python-version: ${{ matrix.python-version }}
158158

@@ -175,7 +175,7 @@ jobs:
175175

176176
# Upload diff images on test failure
177177
- name: Upload diff images if any test fails
178-
uses: actions/[email protected].1
178+
uses: actions/[email protected].2
179179
if: failure()
180180
with:
181181
name: artifact-${{ matrix.os }}-${{ matrix.python-version }}

‎.github/workflows/ci_tests_dev.yaml

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

187187
# Upload diff images on test failure
188188
- name: Upload diff images if any test fails
189-
uses: actions/[email protected].1
189+
uses: actions/[email protected].2
190190
if: ${{ failure() }}
191191
with:
192192
name: artifact-${{ matrix.os }}-GMT-${{ matrix.gmt_git_ref }}

‎.github/workflows/ci_tests_legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
netCDF4
6868
packaging
6969
contextily
70-
geopandas
70+
geopandas=1.0
7171
ipython
7272
pyarrow-core
7373
rioxarray

‎.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
# Generate token from GenericMappingTools bot
19-
- uses: actions/create-github-app-token@v1.11.6
19+
- uses: actions/create-github-app-token@v1.12.0
2020
id: generate-token
2121
with:
2222
app-id: ${{ secrets.APP_ID }}

‎.github/workflows/publish-to-pypi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
ls -lh dist/
7575
7676
- name: Store the distribution packages
77-
uses: actions/[email protected].1
77+
uses: actions/[email protected].2
7878
with:
7979
name: python-package-distributions
8080
path: dist/
@@ -93,7 +93,7 @@ jobs:
9393

9494
steps:
9595
- name: Download all the dists
96-
uses: actions/[email protected].0
96+
uses: actions/[email protected].1
9797
with:
9898
name: python-package-distributions
9999
path: dist/
@@ -117,7 +117,7 @@ jobs:
117117

118118
steps:
119119
- name: Download all the dists
120-
uses: actions/[email protected].0
120+
uses: actions/[email protected].1
121121
with:
122122
name: python-package-distributions
123123
path: dist/

‎.mailmap

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Dongdong Tian <[email protected]>
2+
Dongdong Tian <[email protected]> <[email protected]>
3+
Jiayuan Yao <[email protected]>
4+
Jiayuan Yao <[email protected]> <[email protected]>
5+
Jing-Hui Tong <[email protected]>
6+
Jing-Hui Tong <[email protected]> <[email protected]>
7+
Max Jones <[email protected]>
8+
Max Jones <[email protected]> <[email protected]>
9+
Max Jones <[email protected]> <[email protected]>
10+
Max Jones <[email protected]> <[email protected]>
11+
Michael Grund <[email protected]> <[email protected]>
12+
Michael Grund <[email protected]> <[email protected]>
13+
Michael Grund <[email protected]> <[email protected]>
14+
Wei Ji Leong <[email protected]>
15+
Wei Ji Leong <[email protected]> <[email protected]>
16+
Wei Ji Leong <[email protected]> <[email protected]>
17+
Will Schlitzer <[email protected]> <[email protected]>
18+
Yvonne Fröhlich <[email protected]> <[email protected]>
19+
Yvonne Fröhlich <[email protected]> <[email protected]>

0 commit comments

Comments
 (0)