Skip to content

Commit 2058373

Browse files
committed
Merge branch 'main' into alias-system
2 parents b305969 + 8e1200f commit 2058373

25 files changed

+610
-286
lines changed

.github/workflows/check-links.yml

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

3636
- name: Link Checker
3737
id: lychee
38-
uses: lycheeverse/lychee-action@v2.2.0
38+
uses: lycheeverse/lychee-action@v2.3.0
3939
with:
4040
fail: false # Don't fail action on broken links
4141
output: /tmp/lychee-out.md

.github/workflows/ci_docs.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,24 @@ jobs:
139139
- name: Build the PDF documentation
140140
run: make -C doc pdf
141141

142+
- name: Create the HTML ZIP archive and rename the PDF file
143+
run: |
144+
cd doc/_build/
145+
cp -r html/ pygmt-docs/
146+
zip -r pygmt-docs.zip pygmt-docs/
147+
mv latex/pygmt.pdf pygmt-docs.pdf
148+
cd ../..
149+
150+
- name: Copy the HTML ZIP archive and PDF to the html folder for dev version
151+
run: cp -v doc/_build/pygmt-docs.zip doc/_build/pygmt-docs.pdf doc/_build/html/
152+
if: github.event_name == 'push' && matrix.os == 'ubuntu-latest'
153+
154+
- name: Upload the HTML ZIP archive and PDF as release assets
155+
run: gh release upload ${{ github.ref_name }} doc/_build/pygmt-docs.zip doc/_build/pygmt-docs.pdf
156+
if: github.event_name == 'release' && matrix.os == 'ubuntu-latest'
157+
env:
158+
GH_TOKEN: ${{ github.token }}
159+
142160
- name: Checkout the gh-pages branch
143161
uses: actions/[email protected]
144162
with:

.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
# Generate token from GenericMappingTools bot
14-
- uses: actions/[email protected].1
14+
- uses: actions/[email protected].3
1515
id: generate-token
1616
with:
1717
app-id: ${{ secrets.APP_ID }}

.readthedocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ sphinx:
3636
configuration: doc/conf.py
3737

3838
# If using Sphinx, optionally build your docs in additional formats such as PDF
39-
formats:
40-
- pdf
39+
# formats:
40+
# - pdf
4141

4242
# Optionally declare the Python requirements required to build your docs
4343
conda:

CITATION.cff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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-02-01
80-
doi: 10.5281/zenodo.14742338
79+
date-released: 2025-02-15
80+
doi: 10.5281/zenodo.14868324
8181
license: BSD-3-Clause
8282
repository-code: https://github.com/GenericMappingTools/pygmt
8383
type: software
84-
version: 0.14.1
84+
version: 0.14.2

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Feel free to cite our work in your research using the following BibTeX:
137137

138138
```
139139
@software{
140-
pygmt_2025_14742338,
140+
pygmt_2025_14868324,
141141
author = {Tian, Dongdong and
142142
Uieda, Leonardo and
143143
Leong, Wei Ji and
@@ -160,9 +160,9 @@ Feel free to cite our work in your research using the following BibTeX:
160160
month = feb,
161161
year = 2025,
162162
publisher = {Zenodo},
163-
version = {0.14.1},
164-
doi = {10.5281/zenodo.14742338},
165-
url = {https://doi.org/10.5281/zenodo.14742338}
163+
version = {0.14.2},
164+
doi = {10.5281/zenodo.14868324},
165+
url = {https://doi.org/10.5281/zenodo.14868324}
166166
}
167167
```
168168

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.14.2': 'v0.14.2',
1516
'v0.14.1': 'v0.14.1',
1617
'v0.14.0': 'v0.14.0',
1718
'v0.13.0': 'v0.13.0',

doc/changes.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Changelog
22

3+
## Release v0.14.2 (2025/02/15)
4+
5+
[![Digital Object Identifier for PyGMT v0.14.2](https://zenodo.org/badge/DOI/10.5281/zenodo.14868324.svg)](https://doi.org/10.5281/zenodo.14868324)
6+
7+
8+
### Bug Fixes
9+
10+
- **Patch release fixing a critical bug introduced in PyGMT v0.14.1**
11+
- Fix the bug for passing text strings with numeric values ([#3804](https://github.com/GenericMappingTools/pygmt/pull/3804))
12+
13+
**Full Changelog**: <https://github.com/GenericMappingTools/pygmt/compare/v0.14.1...v0.14.2>
14+
15+
### Contributors
16+
17+
* [Dongdong Tian](https://github.com/seisman)
18+
19+
---
20+
321
## Release v0.14.1 (2025/02/01)
422

523
[![Digital Object Identifier for PyGMT v0.14.1](https://zenodo.org/badge/DOI/10.5281/zenodo.14742338.svg)](https://doi.org/10.5281/zenodo.14742338)

doc/conf.py

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from pygmt import __commit__, __version__
1010
from pygmt.clib import required_gmt_version
1111
from pygmt.sphinx_gallery import PyGMTScraper
12-
from sphinx_gallery.sorting import ExampleTitleSortKey, ExplicitOrder
1312

1413
# Dictionary for dependency name and minimum required versions
1514
requirements = {
@@ -112,34 +111,32 @@
112111
],
113112
# Set paths where to save the generated examples
114113
"gallery_dirs": ["intro", "tutorials", "gallery", "projections"],
115-
"subsection_order": ExplicitOrder(
116-
[
117-
"../examples/intro",
118-
"../examples/tutorials/basics",
119-
"../examples/tutorials/advanced",
120-
"../examples/gallery/maps",
121-
"../examples/gallery/lines",
122-
"../examples/gallery/symbols",
123-
"../examples/gallery/images",
124-
"../examples/gallery/3d_plots",
125-
"../examples/gallery/seismology",
126-
"../examples/gallery/basemaps",
127-
"../examples/gallery/histograms",
128-
"../examples/gallery/embellishments",
129-
"../examples/projections/azim",
130-
"../examples/projections/conic",
131-
"../examples/projections/cyl",
132-
"../examples/projections/misc",
133-
"../examples/projections/nongeo",
134-
"../examples/projections/table",
135-
]
136-
),
114+
"subsection_order": [
115+
"../examples/intro",
116+
"../examples/tutorials/basics",
117+
"../examples/tutorials/advanced",
118+
"../examples/gallery/maps",
119+
"../examples/gallery/lines",
120+
"../examples/gallery/symbols",
121+
"../examples/gallery/images",
122+
"../examples/gallery/3d_plots",
123+
"../examples/gallery/seismology",
124+
"../examples/gallery/basemaps",
125+
"../examples/gallery/histograms",
126+
"../examples/gallery/embellishments",
127+
"../examples/projections/azim",
128+
"../examples/projections/conic",
129+
"../examples/projections/cyl",
130+
"../examples/projections/misc",
131+
"../examples/projections/nongeo",
132+
"../examples/projections/table",
133+
],
137134
# Pattern to search for example files
138135
"filename_pattern": r"\.py",
139136
# Remove the "Download all examples" button from the top level gallery
140137
"download_all_examples": False,
141138
# Sort gallery examples by the file names instead of number of lines [Default]
142-
"within_subsection_order": ExampleTitleSortKey,
139+
"within_subsection_order": "ExampleTitleSortKey",
143140
# Directory where function granular galleries are stored
144141
"backreferences_dir": "api/generated/backreferences",
145142
# Modules for which function level galleries are created (given as tuple of strings)

doc/minversions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ compatibility reasons.
4141
| PyGMT Version | GMT | Python | NumPy | pandas | Xarray |
4242
|---|---|---|---|---|---|
4343
| [Dev][]* [<doc:dev>] | {{ requires.gmt }} | {{ requires.python }} | {{ requires.numpy }} | {{ requires.pandas }} | {{ requires.xarray }} |
44+
| <tag:v0.14.2> [<doc:v0.14.2>] | >=6.4.0 | >=3.11 | >=1.25 | >=2.0 | >=2023.04 |
4445
| <tag:v0.14.1> [<doc:v0.14.1>] | >=6.4.0 | >=3.11 | >=1.25 | >=2.0 | >=2023.04 |
4546
| <tag:v0.14.0> [<doc:v0.14.0>] | >=6.4.0 | >=3.11 | >=1.25 | >=2.0 | >=2023.04 |
4647
| <tag:v0.13.0> [<doc:v0.13.0>] | >=6.3.0 | >=3.10 | >=1.24 | >=1.5 | >=2022.09 |

0 commit comments

Comments
 (0)