Skip to content

Commit 2db06b2

Browse files
committed
Merge branch 'main' into alias-system
2 parents 9af5ba1 + c156826 commit 2db06b2

Some content is hidden

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

51 files changed

+299
-139
lines changed

.github/workflows/benchmarks.yml

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

4949
# Install Micromamba with conda-forge dependencies
5050
- name: Setup Micromamba
51-
uses: mamba-org/[email protected].4
51+
uses: mamba-org/[email protected].5
5252
with:
5353
environment-name: pygmt
5454
cache-environment: true

.github/workflows/cache_data.yaml

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

4747
# Install Micromamba with conda-forge dependencies
4848
- name: Setup Micromamba
49-
uses: mamba-org/[email protected].4
49+
uses: mamba-org/[email protected].5
5050
with:
5151
environment-name: pygmt
5252
create-args: >-

.github/workflows/ci_docs.yml

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

8484
# Install Micromamba with conda-forge dependencies
8585
- name: Setup Micromamba
86-
uses: mamba-org/[email protected].4
86+
uses: mamba-org/[email protected].5
8787
with:
8888
environment-name: pygmt
8989
cache-environment: true

.github/workflows/ci_doctests.yaml

Lines changed: 1 addition & 1 deletion
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].4
48+
uses: mamba-org/[email protected].5
4949
with:
5050
environment-name: pygmt
5151
create-args: >-

.github/workflows/ci_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray netCDF4 sphinx-gallery'
7979
# Python 3.13 + core packages (latest versions) + optional packages
8080
- python-version: '3.13'
81-
numpy-version: '2.2'
81+
numpy-version: '2.3'
8282
pandas-version: ''
8383
xarray-version: ''
8484
optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray netCDF4 sphinx-gallery'
@@ -116,7 +116,7 @@ jobs:
116116

117117
# Install Micromamba with conda-forge dependencies
118118
- name: Setup Micromamba
119-
uses: mamba-org/[email protected].4
119+
uses: mamba-org/[email protected].5
120120
with:
121121
environment-name: pygmt
122122
cache-environment: true

.github/workflows/ci_tests_dev.yaml

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

6161
# Install Micromamba with conda-forge dependencies
6262
- name: Setup Micromamba
63-
uses: mamba-org/[email protected].4
63+
uses: mamba-org/[email protected].5
6464
with:
6565
environment-name: pygmt
6666
cache-environment: true

.github/workflows/ci_tests_legacy.yaml

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

5555
# Install Micromamba with conda-forge dependencies
5656
- name: Setup Micromamba
57-
uses: mamba-org/[email protected].4
57+
uses: mamba-org/[email protected].5
5858
with:
5959
environment-name: pygmt
6060
create-args: >-

AUTHORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The following people have contributed code and/or documentation to the project
2626
| [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | Development Seed, USA |
2727
| [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated |
2828
| [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 |
29+
| [Yvonne Fröhlich](https://github.com/yvonnefroehlich) | [0000-0002-8566-0619](https://orcid.org/0000-0002-8566-0619) | Unaffiliated |
3030

3131
Individuals who have made significant contributions to PyGMT are recognized on the
3232
[PyGMT Team](https://www.pygmt.org/dev/team.html) page.

CITATION.cff

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ authors:
1818
orcid: https://orcid.org/0000-0003-2354-1988
1919
- given-names: Yvonne
2020
family-names: Fröhlich
21-
affiliation: Karlsruhe Institute of Technology, Germany
22-
orcid: https://orcid.org/0000-0002-8566-0619
23-
- given-names: William
24-
family-names: Schlitzer
2521
affiliation: Unaffiliated
26-
orcid: https://orcid.org/0000-0002-5843-2282
22+
orcid: https://orcid.org/0000-0002-8566-0619
2723
- given-names: Michael
2824
family-names: Grund
2925
affiliation: SNP Innovation Lab GmbH, Germany
3026
orcid: https://orcid.org/0000-0001-8759-2018
27+
- given-names: William
28+
family-names: Schlitzer
29+
affiliation: Unaffiliated
30+
orcid: https://orcid.org/0000-0002-5843-2282
3131
- given-names: Max
3232
family-names: Jones
3333
affiliation: University of Hawaiʻi at Mānoa, USA
@@ -76,9 +76,9 @@ authors:
7676
family-names: Wessel
7777
affiliation: University of Hawaiʻi at Mānoa, USA
7878
orcid: https://orcid.org/0000-0001-5708-7336
79-
date-released: 2025-03-31
80-
doi: 10.5281/zenodo.15071586
79+
date-released: 2025-06-18
80+
doi: 10.5281/zenodo.15628725
8181
license: BSD-3-Clause
8282
repository-code: https://github.com/GenericMappingTools/pygmt
8383
type: software
84-
version: 0.15.0
84+
version: 0.16.0

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Afterwards, feel free to look at our [Tutorials](https://www.pygmt.org/latest/tu
3030
visit the [Gallery](https://www.pygmt.org/latest/gallery), and check out some
3131
[external PyGMT examples](https://www.pygmt.org/latest/external_resources.html)!
3232

33-
![Quick Introduction to PyGMT YouTube Video](https://raw.githubusercontent.com/GenericMappingTools/pygmt/refs/heads/main/doc/_static/scipy2022-youtube-thumbnail.jpg)
33+
[![Quick Introduction to PyGMT YouTube Video](https://raw.githubusercontent.com/GenericMappingTools/pygmt/refs/heads/main/doc/_static/scipy2022-youtube-thumbnail.jpg)](https://www.youtube.com/watch?v=4iPnITXrxVU)
3434

3535
## About
3636

@@ -137,13 +137,13 @@ Feel free to cite our work in your research using the following BibTeX:
137137

138138
```
139139
@software{
140-
pygmt_2025_15071586,
140+
pygmt_2025_15628725,
141141
author = {Tian, Dongdong and
142142
Uieda, Leonardo and
143143
Leong, Wei Ji and
144144
Fröhlich, Yvonne and
145-
Schlitzer, William and
146145
Grund, Michael and
146+
Schlitzer, William and
147147
Jones, Max and
148148
Toney, Liam and
149149
Yao, Jiayuan and
@@ -157,12 +157,12 @@ Feel free to cite our work in your research using the following BibTeX:
157157
Quinn, Jamie and
158158
Wessel, Paul},
159159
title = {{PyGMT: A Python interface for the Generic Mapping Tools}},
160-
month = mar,
160+
month = jun,
161161
year = 2025,
162162
publisher = {Zenodo},
163-
version = {0.15.0},
164-
doi = {10.5281/zenodo.15071586},
165-
url = {https://doi.org/10.5281/zenodo.15071586}
163+
version = {0.16.0},
164+
doi = {10.5281/zenodo.15628725},
165+
url = {https://doi.org/10.5281/zenodo.15628725}
166166
}
167167
```
168168

0 commit comments

Comments
 (0)