Skip to content

Commit c4bcf1e

Browse files
weiji14weiji14
committed
Merge branch 'main' into fix/None_kwargs
2 parents 4be09cc + 0aa04d7 commit c4bcf1e

40 files changed

+844
-89
lines changed

‎.github/ISSUE_TEMPLATE/release_checklist.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ assignees: ''
2121
- [ ] Finish up 'Changelog entry for v0.x.x' Pull Request:
2222
- [ ] Add a new entry in `doc/_static/version_switch.js` for documentation switcher
2323
- [ ] Update `CITATION.cff` and BibTeX at https://github.com/GenericMappingTools/pygmt#citing-pygmt
24-
- [ ] Add the documentation link https://github.com/GenericMappingTools/pygmt#documentation-for-other-versions
25-
- [ ] Add compatibility information https://github.com/GenericMappingTools/pygmt#compatibility-with-gmt-and-pythonnumpy-versions
24+
- [ ] Update authorship list
25+
- [ ] Update DOI (and url for BibTeX)
26+
- [ ] Update version
27+
- [ ] Update date released
28+
- [ ] Add the documentation link https://github.com/GenericMappingTools/pygmt#compatibility-with-gmtpythonnumpy-versions
29+
- [ ] Add compatibility information https://github.com/GenericMappingTools/pygmt#compatibility-with-gmtpythonnumpy-versions
2630
- [ ] Copy draft changelog from Release Drafter and edit it to look nice ([see maintainers guide for details](https://www.pygmt.org/dev/maintenance.html#updating-the-changelog))
2731

2832
**Release**:
@@ -33,11 +37,10 @@ assignees: ''
3337
- [ ] Manually upload the pygmt-vX.Y.Z.zip and baseline-images.zip files to https://zenodo.org/deposit, ensure that it is filed under the correct reserved DOI
3438

3539
**After release**:
36-
- [ ] Update conda-forge [pygmt-feedstock](https://github.com/conda-forge/pygmt-feedstock) [Usually done automatically by conda-forge's bot]
40+
- [ ] Update conda-forge [pygmt-feedstock](https://github.com/conda-forge/pygmt-feedstock) [Done automatically by conda-forge's bot, but remember to pin NEP29 versions]
3741
- [ ] Bump PyGMT version on https://github.com/GenericMappingTools/try-gmt (after conda-forge update)
3842
- [ ] Announce the release on:
3943
- [ ] GMT [forum](https://forum.generic-mapping-tools.org/c/news/) (do this announcement first! draft on https://hackmd.io/@pygmt. requires moderator status)
40-
- [ ] [Major/Minor releases only] GMT [website](https://github.com/GenericMappingTools/website) (News)
4144
- [ ] [ResearchGate](https://www.researchgate.net/project/PyGMT-A-Python-interface-for-the-Generic-Mapping-Tools) (after forum announcement)
4245
- [ ] [Twitter](https://twitter.com/gmt_dev) (after forum announcement)
4346
---

‎.github/workflows/cache_data.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ jobs:
3838
# Install GMT and other required dependencies from conda-forge
3939
- name: Install dependencies
4040
run: |
41-
mamba install gmt=6.3.0 \
42-
numpy pandas xarray netCDF4 packaging matplotlib
41+
mamba install gmt=6.3.0 numpy pandas xarray netCDF4 packaging \
42+
build matplotlib
4343
4444
# Install the package that we want to test
4545
- name: Install the package
4646
run: |
47-
python setup.py sdist --formats=zip
47+
python -m build --sdist
4848
pip install dist/*
4949
5050
# Download remote files

‎.github/workflows/check-links.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
path: documentation
2727

2828
- name: Link Checker
29-
uses: lycheeverse/lychee-action@v1.3.2
29+
uses: lycheeverse/lychee-action@v1.4.1
3030
with:
3131
# 429: Too many requests
3232
args: >
@@ -56,7 +56,7 @@ jobs:
5656
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
5757

5858
- name: Create Issue From File
59-
uses: peter-evans/create-issue-from-file@v3
59+
uses: peter-evans/create-issue-from-file@v4
6060
with:
6161
title: Link Checker Report on ${{ steps.date.outputs.date }}
6262
content-filepath: ./lychee/out.md

‎.github/workflows/ci_docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Install dependencies
7272
run: |
7373
mamba install gmt=6.3.0 numpy pandas xarray netCDF4 packaging \
74-
ipython make myst-parser geopandas \
74+
build ipython make myst-parser geopandas \
7575
sphinx sphinx-copybutton sphinx-gallery sphinx_rtd_theme
7676
7777
# Show installed pkg information for postmortem diagnostic
@@ -99,7 +99,7 @@ jobs:
9999
# Install the package that we want to test
100100
- name: Install the package
101101
run: |
102-
python setup.py sdist --formats=zip
102+
python -m build --sdist
103103
pip install dist/*
104104
105105
# Build the documentation

‎.github/workflows/ci_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
mamba install gmt=6.3.0 numpy=${{ matrix.numpy-version }} \
9797
pandas xarray netCDF4 packaging \
9898
${{ matrix.optional-packages }} \
99-
dvc make pytest>=6.0 \
99+
build dvc make pytest>=6.0 \
100100
pytest-cov pytest-doctestplus pytest-mpl sphinx-gallery tomli
101101
102102
# Show installed pkg information for postmortem diagnostic
@@ -130,7 +130,7 @@ jobs:
130130
# Install the package that we want to test
131131
- name: Install the package
132132
run: |
133-
python setup.py sdist --formats=zip
133+
python -m build --sdist
134134
pip install dist/*
135135
136136
# Run the tests

‎.github/workflows/ci_tests_dev.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
with:
6868
token: ${{ steps.generate-token.outputs.token }}
6969
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
70-
ref: ${{ github.event.pull_request.head.sha }}
70+
ref: ${{ github.event.client_payload.pull_request.head.ref }}
7171
# fecth all history so that setuptools-scm works
7272
fetch-depth: 0
7373

@@ -92,7 +92,7 @@ jobs:
9292
geopandas ghostscript libnetcdf hdf5 zlib curl pcre make
9393
pip install --pre --prefer-binary \
9494
numpy pandas xarray netCDF4 packaging \
95-
dvc ipython 'pytest>=6.0' pytest-cov \
95+
build dvc ipython 'pytest>=6.0' pytest-cov \
9696
pytest-doctestplus pytest-mpl sphinx-gallery tomli
9797
9898
# Pull baseline image data from dvc remote (DAGsHub)
@@ -131,11 +131,10 @@ jobs:
131131
touch ~/.gmt/server/gmt_data_server.txt ~/.gmt/server/gmt_hash_server.txt
132132
ls -lhR ~/.gmt
133133
134-
135134
# Install the package that we want to test
136135
- name: Install the package
137136
run: |
138-
python setup.py sdist --formats=zip
137+
python -m build --sdist
139138
pip install dist/*
140139
141140
- name: Add GMT's bin to PATH (Linux/macOS)
@@ -163,7 +162,7 @@ jobs:
163162
path: tmp-test-dir-with-unique-name
164163

165164
- name: Add reaction
166-
uses: peter-evans/create-or-update-comment@v1
165+
uses: peter-evans/create-or-update-comment@v2
167166
if: github.event_name == 'repository_dispatch'
168167
with:
169168
token: ${{ steps.generate-token.outputs.token }}

‎.github/workflows/dvc-diff.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
echo ::set-output name=report::$report
9696
9797
- name: Find comment with image diff report
98-
uses: peter-evans/find-comment@v1.3.0
98+
uses: peter-evans/find-comment@v2.0.0
9999
id: fc
100100
with:
101101
issue-number: ${{ github.event.pull_request.number }}
@@ -104,14 +104,14 @@ jobs:
104104

105105
- name: Create comment with image diff report
106106
if: steps.fc.outputs.comment-id == ''
107-
uses: peter-evans/create-or-update-comment@v1.4.4
107+
uses: peter-evans/create-or-update-comment@v2
108108
with:
109109
issue-number: ${{ github.event.pull_request.number }}
110110
body: ${{ steps.image-diff.outputs.report }}
111111

112112
- name: Update comment with new image diff report
113113
if: steps.fc.outputs.comment-id != ''
114-
uses: peter-evans/create-or-update-comment@v1.4.4
114+
uses: peter-evans/create-or-update-comment@v2
115115
with:
116116
comment-id: ${{ steps.fc.outputs.comment-id }}
117117
body: ${{ steps.image-diff.outputs.report }}

‎.github/workflows/format-command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
token: ${{ steps.generate-token.outputs.token }}
2020
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
21-
ref: ${{ github.event.pull_request.head.sha }}
21+
ref: ${{ github.event.client_payload.pull_request.head.ref }}
2222

2323
# Setup Python environment
2424
- uses: actions/[email protected]
@@ -43,7 +43,7 @@ jobs:
4343
fi
4444
4545
- name: Add reaction
46-
uses: peter-evans/create-or-update-comment@v1
46+
uses: peter-evans/create-or-update-comment@v2
4747
with:
4848
token: ${{ steps.generate-token.outputs.token }}
4949
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
python-version: '3.10'
3535

3636
- name: Install dependencies
37-
run: python -m pip install setuptools wheel
37+
run: python -m pip install build
3838

3939
# This step is only necessary for testing purposes and for TestPyPI
4040
- name: Fix up version string for TestPyPI
@@ -43,7 +43,7 @@ jobs:
4343
# Change setuptools-scm local_scheme to "no-local-version" so the
4444
# local part of the version isn't included, making the version string
4545
# compatible with PyPI.
46-
sed --in-place "s/node-and-date/no-local-version/g" setup.py
46+
sed --in-place "s/node-and-date/no-local-version/g" pyproject.toml
4747
4848
- name: Build source and wheel distributions
4949
run: |

‎.github/workflows/release-baseline-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
shasum -a 256 baseline-images.zip
3535
3636
- name: Upload baseline image as a release asset
37-
uses: shogo82148/actions-upload-release-asset@v1.5.0
37+
uses: shogo82148/actions-upload-release-asset@v1.6.0
3838
with:
3939
upload_url: ${{ github.event.release.upload_url }}
4040
asset_path: baseline-images.zip

‎.github/workflows/slash-command-dispatch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
private_key: ${{ secrets.APP_PRIVATE_KEY }}
1818

1919
- name: Slash Command Dispatch
20-
uses: peter-evans/slash-command-dispatch@v2
20+
uses: peter-evans/slash-command-dispatch@v3
2121
with:
2222
token: ${{ steps.generate-token.outputs.token }}
2323
commands: |

‎AUTHORS.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ The following people have contributed code and/or documentation to the project
99
(alphabetical by name) and are considered to be "PyGMT Developers":
1010

1111
* [Abhishek Anant](https://twitter.com/itsabhianant) | [0000-0002-5751-2010](https://orcid.org/0000-0002-5751-2010) | Unaffiliated
12-
* [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | China University of Geosciences
13-
* [Jamie Quinn](http://jamiejquinn.com) | [0000-0002-0268-7032](https://orcid.org/0000-0002-0268-7032) | University College London
14-
* [Jiayuan Yao](https://github.com/core-man) | [0000-0001-7036-4238](https://orcid.org/0000-0001-7036-4238) | Nanyang Technological University
15-
* [Kathryn Materna](https://github.com/kmaterna) | [0000-0002-6687-980X](https://orcid.org/0000-0002-6687-980X) | US Geological Survey
16-
* [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool
17-
* [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | University of Alaska Fairbanks
18-
* [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences
19-
* [Meghan Jones](https://github.com/meghanrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawai'i at Mānoa
20-
* [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018) | Innoplexia GmbH
21-
* [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon
22-
* [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | The Ohio State University
12+
* [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | China University of Geosciences, China
13+
* [Jamie Quinn](http://jamiejquinn.com) | [0000-0002-0268-7032](https://orcid.org/0000-0002-0268-7032) | University College London, United Kingdom
14+
* [Jiayuan Yao](https://github.com/core-man) | [0000-0001-7036-4238](https://orcid.org/0000-0001-7036-4238) | Nanyang Technological University, Singapore
15+
* [Kathryn Materna](https://github.com/kmaterna) | [0000-0002-6687-980X](https://orcid.org/0000-0002-6687-980X) | US Geological Survey, USA
16+
* [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool, United Kingdom
17+
* [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | University of Alaska Fairbanks, USA
18+
* [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences, Germany
19+
* [Meghan Jones](https://github.com/meghanrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawai'i at Mānoa, USA
20+
* [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018) | Innoplexia GmbH, Germany
21+
* [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon, USA
22+
* [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | The Ohio State University, USA
2323
* [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated
24-
* [Yohai Magen](https://github.com/yohaimagen) | [0000-0002-4892-4013](https://orcid.org/0000-0002-4892-4013) | Tel Aviv University
24+
* [Yohai Magen](https://github.com/yohaimagen) | [0000-0002-4892-4013](https://orcid.org/0000-0002-4892-4013) | Tel Aviv University, Israel

‎CITATION.cff

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ authors:
2424
family-names: Schlitzer
2525
affiliation: Unaffiliated
2626
orcid: https://orcid.org/0000-0002-5843-2282
27-
- given-names: Liam
28-
family-names: Toney
29-
affiliation: University of Alaska Fairbanks, USA
30-
orcid: https://orcid.org/0000-0003-0167-9433
3127
- given-names: Michael
3228
family-names: Grund
3329
affiliation: Innoplexia GmbH, Germany
3430
orcid: https://orcid.org/0000-0001-8759-2018
31+
- given-names: Liam
32+
family-names: Toney
33+
affiliation: University of Alaska Fairbanks, USA
34+
orcid: https://orcid.org/0000-0003-0167-9433
3535
- given-names: Jiayuan
3636
family-names: Yao
3737
affiliation: Nanyang Technological University, Singapore
3838
orcid: https://orcid.org/0000-0001-7036-4238
3939
- given-names: Yohai
4040
family-names: Magen
41-
affiliation: Tel Aviv University
41+
affiliation: Tel Aviv University, Israel
4242
orcid: https://orcid.org/0000-0002-4892-4013
4343
- given-names: Kathryn
4444
family-names: Materna
@@ -58,15 +58,15 @@ authors:
5858
orcid: https://orcid.org/0000-0002-5190-4478
5959
- given-names: Jamie
6060
family-names: Quinn
61-
affiliation: University College London
61+
affiliation: University College London, United Kingdom
6262
orcid: https://orcid.org/0000-0002-0268-7032
6363
- given-names: Paul
6464
family-names: Wessel
6565
affiliation: University of Hawai'i at Mānoa, USA
6666
orcid: https://orcid.org/0000-0001-5708-7336
67-
date-released: 2021-10-29
68-
doi: 10.5281/zenodo.5607255
67+
date-released: 2022-03-14
68+
doi: 10.5281/zenodo.6349217
6969
license: BSD-3-Clause
7070
repository-code: https://github.com/GenericMappingTools/pygmt
7171
type: software
72-
version: 0.5.0
72+
version: 0.6.0

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ install:
2929
pip install --no-deps -e .
3030

3131
package:
32-
python setup.py sdist bdist_wheel
32+
python -m build --sdist --wheel
3333

3434
test:
3535
# Run a tmp folder to make sure the tests are run on the installed version

‎README.rst

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ publication quality maps and figures. It provides a Pythonic interface for the
6363
`Generic Mapping Tools (GMT) <https://github.com/GenericMappingTools/gmt>`__, a
6464
command-line program widely used in the Earth Sciences.
6565

66-
We rely heavily on new features that have been implemented in GMT 6.0. In particular,
67-
a new *modern execution mode* that greatly simplifies figure creation. **These features
68-
are not available in the 5.4 version of GMT**.
69-
7066
Project goals
7167
-------------
7268

@@ -156,14 +152,14 @@ Developers". Feel free to cite our work in your research using the following Bib
156152

157153
.. code-block::
158154
159-
@software{pygmt_2021_5607255,
155+
@software{pygmt_2022_6349217,
160156
author = {Uieda, Leonardo and
161157
Tian, Dongdong and
162158
Leong, Wei Ji and
163159
Jones, Meghan and
164160
Schlitzer, William and
165-
Toney, Liam and
166161
Grund, Michael and
162+
Toney, Liam and
167163
Yao, Jiayuan and
168164
Magen, Yohai and
169165
Materna, Kathryn and
@@ -173,12 +169,12 @@ Developers". Feel free to cite our work in your research using the following Bib
173169
Quinn, Jamie and
174170
Wessel, Paul},
175171
title = {{PyGMT: A Python interface for the Generic Mapping Tools}},
176-
month = oct,
177-
year = 2021,
172+
month = march,
173+
year = 2022,
178174
publisher = {Zenodo},
179-
version = {v0.5.0},
180-
doi = {10.5281/zenodo.5607255},
181-
url = {https://doi.org/10.5281/zenodo.5607255}
175+
version = {v0.6.0},
176+
doi = {10.5281/zenodo.6349217},
177+
url = {https://doi.org/10.5281/zenodo.6349217}
182178
}
183179
184180
To cite a specific version of PyGMT, go to our Zenodo page at
@@ -236,7 +232,12 @@ Compatibility with GMT/Python/NumPy versions
236232
- >=6.3.0
237233
- >=3.8
238234
- >=1.19
239-
* - `v0.5.0 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.5.0>`_ (latest release)
235+
* - `v0.6.0 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.6.0>`_ (latest release)
236+
- `v0.6.0 Documentation <https://www.pygmt.org/v0.6.0>`_
237+
- >=6.3.0
238+
- >=3.8
239+
- >=1.19
240+
* - `v0.5.0 <https://github.com/GenericMappingTools/pygmt/releases/tag/v0.5.0>`_
240241
- `v0.5.0 Documentation <https://www.pygmt.org/v0.5.0>`_
241242
- >=6.2.0
242243
- >=3.7

‎doc/_static/version_switch.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
var all_versions = {
1313
'latest': 'latest',
1414
'dev': 'dev',
15+
'v0.6.0': 'v0.6.0',
1516
'v0.5.0': 'v0.5.0',
1617
'v0.4.1': 'v0.4.1',
1718
'v0.4.0': 'v0.4.0',

‎doc/api/index.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ Operations on tabular data
124124
sphdistance
125125
sphinterpolate
126126
surface
127+
triangulate
128+
triangulate.regular_grid
129+
triangulate.delaunay_triples
127130
xyz2grd
128131

129132
Operations on raster data

0 commit comments

Comments
 (0)