Skip to content

Commit 07c4b4b

Browse files
seismanseisman
authored
Merge branch 'main' into alias-system
2 parents 478213d + 991cafb commit 07c4b4b

Some content is hidden

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

60 files changed

+584
-401
lines changed

‎.github/ISSUE_TEMPLATE/5-bump_gmt_checklist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ using the following command:
3535
**To-Do for bumping the minimum required GMT version**:
3636

3737
- [ ] Bump the minimum required GMT version (1 PR)
38-
- [ ] Update `required_version` in `pygmt/clib/session.py`
38+
- [ ] Update `required_gmt_version` in `pygmt/clib/__init__.py`
3939
- [ ] Update `test_get_default` in `pygmt/tests/test_clib.py`
4040
- [ ] Update minimum required versions in `doc/minversions.md`
4141
- [ ] Remove unsupported GMT version from `.github/workflows/ci_tests_legacy.yaml`

‎.github/workflows/benchmarks.yml

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

8888
# Run the benchmark tests
8989
- name: Run benchmarks
90-
uses: CodSpeedHQ/action@v2.4.3
90+
uses: CodSpeedHQ/action@v3.0.0
9191
with:
9292
# 'bash -el -c' is needed to use the custom shell.
9393
# See https://github.com/CodSpeedHQ/action/issues/65.

‎.github/workflows/cache_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
xarray
5959
netCDF4
6060
packaging
61-
build
61+
python-build
6262
6363
# Install the package that we want to test
6464
- name: Install the package

‎.github/workflows/check-links.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949
--exclude "^https://github.com/GenericMappingTools/gmt/releases/tag/X.Y.Z$"
5050
--exclude "^https://github.com/GenericMappingTools/pygmt/edit"
5151
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/new"
52+
--exclude "^https://github.com/GenericMappingTools/pygmt/releases/tag/%7B%7Bpath%7D%7D"
53+
--exclude "^https://www.pygmt.org/%7B%7Bpath%7D%7D"
5254
--exclude "^git"
5355
--exclude "^file://"
5456
--exclude "https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf"

‎.github/workflows/ci_docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ jobs:
104104
geopandas<1.0
105105
ipython
106106
rioxarray
107-
build
108107
make
109108
pip
110-
myst-parser
109+
python-build
110+
myst-nb
111111
panel
112112
sphinx
113113
sphinx-autodoc-typehints

‎.github/workflows/ci_doctests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ jobs:
6262
ipython
6363
pyarrow
6464
rioxarray
65-
build
6665
make
6766
pip
67+
python-build
6868
pytest
6969
pytest-doctestplus
7070
pytest-mpl

‎.github/workflows/ci_tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ jobs:
7272
- python-version: '3.10'
7373
numpy-version: '1.24'
7474
pandas-version: '=1.5'
75-
xarray-version: '=2022.06'
75+
xarray-version: '=2022.09'
7676
optional-packages: ''
7777
- python-version: '3.12'
78-
numpy-version: '2.0'
78+
numpy-version: '2.1'
7979
pandas-version: ''
8080
xarray-version: ''
8181
optional-packages: ' contextily geopandas ipython pyarrow rioxarray sphinx-gallery'
@@ -125,10 +125,10 @@ jobs:
125125
xarray${{ matrix.xarray-version }}
126126
netCDF4
127127
packaging
128-
build
129128
dvc
130129
make
131130
pip
131+
python-build
132132
pytest
133133
pytest-cov
134134
pytest-doctestplus

‎.github/workflows/ci_tests_legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ jobs:
7272
pyarrow
7373
rioxarray
7474
sphinx-gallery
75-
build
7675
make
7776
pip
77+
python-build
7878
pytest
7979
pytest-doctestplus
8080
pytest-mpl

‎AUTHORS.md

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,25 @@ Hawaiʻi at Mānoa.
88
The following people have contributed code and/or documentation to the project
99
(alphabetically by name) and are considered to be "PyGMT Developers":
1010

11-
* [Abhishek Anant](https://twitter.com/itsabhianant) | [0000-0002-5751-2010](https://orcid.org/0000-0002-5751-2010) | Unaffiliated
12-
* [Andre L. Belem](https://github.com/andrebelem) | [0000-0002-8865-6180](https://orcid.org/0000-0002-8865-6180) | Fluminense Federal University, Brazil
13-
* [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | China University of Geosciences, China
14-
* [Jamie Quinn](http://jamiejquinn.com) | [0000-0002-0268-7032](https://orcid.org/0000-0002-0268-7032) | University College London, United Kingdom
15-
* [Jiayuan Yao](https://github.com/core-man) | [0000-0001-7036-4238](https://orcid.org/0000-0001-7036-4238) | Nanyang Technological University, Singapore
16-
* [Jing-Hui Tong](https://github.com/jhtong33) | [0009-0002-7195-3071](https://orcid.org/0009-0002-7195-3071) | National Taiwan Normal University, Taiwan
17-
* [Kathryn Materna](https://github.com/kmaterna) | [0000-0002-6687-980X](https://orcid.org/0000-0002-6687-980X) | US Geological Survey, USA
18-
* [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool, United Kingdom
19-
* [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | University of Alaska Fairbanks, USA
20-
* [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences, Germany
21-
* [Max Jones](https://github.com/maxrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawaiʻi at Mānoa, USA
22-
* [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018) | SNP Innovation Lab GmbH, Germany
23-
* [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon, USA
24-
* [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | Development Seed, USA
25-
* [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated
26-
* [Yohai Magen](https://github.com/yohaimagen) | [0000-0002-4892-4013](https://orcid.org/0000-0002-4892-4013) | Tel Aviv University, Israel
27-
* [Yvonne Fröhlich](https://github.com/yvonnefroehlich) | [0000-0002-8566-0619](https://orcid.org/0000-0002-8566-0619) | Karlsruhe Institute of Technology, Germany
11+
| Name | ORCID | Affiliation |
12+
|---|---|---|
13+
| [Abhishek Anant](https://twitter.com/itsabhianant) | [0000-0002-5751-2010](https://orcid.org/0000-0002-5751-2010) | Unaffiliated |
14+
| [Andre L. Belem](https://github.com/andrebelem) | [0000-0002-8865-6180](https://orcid.org/0000-0002-8865-6180) | Fluminense Federal University, Brazil |
15+
| [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | China University of Geosciences, China |
16+
| [Jamie Quinn](http://jamiejquinn.com) | [0000-0002-0268-7032](https://orcid.org/0000-0002-0268-7032) | University College London, United Kingdom |
17+
| [Jiayuan Yao](https://github.com/core-man) | [0000-0001-7036-4238](https://orcid.org/0000-0001-7036-4238) | Nanyang Technological University, Singapore |
18+
| [Jing-Hui Tong](https://github.com/jhtong33) | [0009-0002-7195-3071](https://orcid.org/0009-0002-7195-3071) | National Taiwan Normal University, Taiwan |
19+
| [Kathryn Materna](https://github.com/kmaterna) | [0000-0002-6687-980X](https://orcid.org/0000-0002-6687-980X) | US Geological Survey, USA |
20+
| [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool, United Kingdom |
21+
| [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | University of Alaska Fairbanks, USA |
22+
| [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences, Germany |
23+
| [Max Jones](https://github.com/maxrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawaiʻi at Mānoa, USA |
24+
| [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018) | SNP Innovation Lab GmbH, Germany |
25+
| [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon, USA |
26+
| [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | Development Seed, USA |
27+
| [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated |
28+
| [Yohai Magen](https://github.com/yohaimagen) | [0000-0002-4892-4013](https://orcid.org/0000-0002-4892-4013) | Tel Aviv University, Israel |
29+
| [Yvonne Fröhlich](https://github.com/yvonnefroehlich) | [0000-0002-8566-0619](https://orcid.org/0000-0002-8566-0619) | Karlsruhe Institute of Technology, Germany |
30+
31+
Individuals who have made significant contributions to PyGMT are recognized on the
32+
[PyGMT Team](https://www.pygmt.org/dev/team.html) page.

‎ci/requirements/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ dependencies:
1818
- ipython
1919
- rioxarray
2020
# Development dependencies (general)
21-
- build
2221
- make
2322
- pip
23+
- python-build
2424
# Dev dependencies (building documentation)
25-
- myst-parser
25+
- myst-nb
2626
- panel
2727
- sphinx
2828
- sphinx-autodoc-typehints

0 commit comments

Comments
 (0)