Skip to content

Commit 1f41808

Browse files
committed
Merge branch 'main' into alias-system
2 parents 477e7cb + bad7943 commit 1f41808

File tree

196 files changed

+4745
-3110
lines changed

Some content is hidden

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

196 files changed

+4745
-3110
lines changed

.dvcignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
# Add patterns of files dvc should ignore, which could improve
2-
# the performance. Learn more at
3-
# https://dvc.org/doc/user-guide/dvcignore
1+
# Add patterns of files dvc should ignore, which could improve the performance.
2+
# Learn more at https://dvc.org/doc/user-guide/project-structure/dvcignore-files

.github/ISSUE_TEMPLATE/1-bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ body:
2323
For more details, check out:
2424
2525
- [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
26-
- [Craft Minimal Bug Reports](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
26+
- [Craft Minimal Bug Reports](https://matthewrocklin.com/minimal-bug-reports)
2727
2828
placeholder: "PASTE CODE HERE"
2929
render: python

.github/ISSUE_TEMPLATE/4-release_checklist.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ assignees: ''
1919

2020
**Before release**:
2121

22-
- [ ] Check [SPEC 0](https://scientific-python.org/specs/spec-0000/) to see if we need to bump the minimum supported versions of GMT, Python and core package dependencies (NumPy/Pandas/Xarray)
22+
- [ ] Check [SPEC 0](https://scientific-python.org/specs/spec-0000/) to see if we need to bump the minimum supported versions of GMT, Python and
23+
core package dependencies (NumPy, pandas, Xarray)
2324
- [ ] Review the ["PyGMT Team" page](https://www.pygmt.org/dev/team.html)
2425
- [ ] Check to ensure that:
2526
- [ ] Deprecations and related tests are removed for this version by running `grep --include="*.py" -r vX.Y.Z` from the base of the repository

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
Fixes #
99

1010

11+
<!-- If significant changes to the documentation are made, please insert the link to the documentation page after it has been built. -->
12+
**Preview**:
13+
14+
1115
**Reminders**
1216

1317
- [ ] Run `make format` and `make check` to make sure the code follows the style guide.

.github/release-drafter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ exclude-contributors:
2424
- 'actions-bot'
2525
- 'dependabot'
2626
- 'dependabot[bot]'
27+
- 'pre-commit-ci'
28+
- 'pre-commit-ci[bot]'
2729
category-template: '### $TITLE'
2830
change-template: '* $TITLE ([#$NUMBER]($URL))'
2931
sort-by: 'title'

.github/workflows/benchmarks.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525

2626
jobs:
2727
benchmarks:
28-
runs-on: ubuntu-22.04
28+
runs-on: ubuntu-latest
2929
if: github.repository == 'GenericMappingTools/pygmt' && (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run/benchmark'))
3030
defaults:
3131
run:
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
# Checkout current git repository
3636
- name: Checkout
37-
uses: actions/checkout@v4.1.7
37+
uses: actions/checkout@v4.2.2
3838
with:
3939
# fetch all history so that setuptools-scm works
4040
fetch-depth: 0
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Install Micromamba with conda-forge dependencies
4747
- name: Setup Micromamba
48-
uses: mamba-org/setup-micromamba@v1.9.0
48+
uses: mamba-org/setup-micromamba@v2.0.1
4949
with:
5050
environment-name: pygmt
5151
condarc: |
@@ -87,8 +87,8 @@ jobs:
8787

8888
# Run the benchmark tests
8989
- name: Run benchmarks
90-
uses: CodSpeedHQ/action@v3.0.0
90+
uses: CodSpeedHQ/action@v3.1.0
9191
with:
9292
# 'bash -el -c' is needed to use the custom shell.
9393
# See https://github.com/CodSpeedHQ/action/issues/65.
94-
run: bash -el -c "python -c \"import pygmt; pygmt.show_versions()\"; PYGMT_USE_EXTERNAL_DISPLAY=false python -m pytest -r P --pyargs pygmt --codspeed"
94+
run: bash -el -c "python -c \"import pygmt; pygmt.show_versions()\"; PYGMT_USE_EXTERNAL_DISPLAY=false python -m pytest -r P --pyargs pygmt --codspeed --override-ini addopts='--verbose'"

.github/workflows/cache_data.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
steps:
3737
# Checkout current git repository
3838
- name: Checkout
39-
uses: actions/checkout@v4.1.7
39+
uses: actions/checkout@v4.2.2
4040
with:
4141
# fetch all history so that setuptools-scm works
4242
fetch-depth: 0
4343

4444
# Install Micromamba with conda-forge dependencies
4545
- name: Setup Micromamba
46-
uses: mamba-org/setup-micromamba@v1.9.0
46+
uses: mamba-org/setup-micromamba@v2.0.1
4747
with:
4848
environment-name: pygmt
4949
condarc: |
@@ -76,7 +76,7 @@ jobs:
7676

7777
# Upload the downloaded files as artifacts to GitHub
7878
- name: Upload artifacts to GitHub
79-
uses: actions/[email protected].0
79+
uses: actions/[email protected].3
8080
with:
8181
name: gmt-cache
8282
include-hidden-files: true

.github/workflows/check-links.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,41 @@ jobs:
2323

2424
steps:
2525
- name: Checkout the repository
26-
uses: actions/checkout@v4.1.7
26+
uses: actions/checkout@v4.2.2
2727
with:
2828
path: repository
2929

3030
- name: Checkout the documentation
31-
uses: actions/checkout@v4.1.7
31+
uses: actions/checkout@v4.2.2
3232
with:
3333
ref: gh-pages
3434
path: documentation
3535

3636
- name: Link Checker
3737
id: lychee
38-
uses: lycheeverse/lychee-action@v1.10.0
38+
uses: lycheeverse/lychee-action@v2.1.0
3939
with:
40+
fail: false # Don't fail action on broken links
4041
output: /tmp/lychee-out.md
4142
# 429: Too many requests
4243
args: >
4344
--accept 429
44-
--exclude "^https://doi.org/10.5281/zenodo$"
45-
--exclude "^https://zenodo.org/badge/DOI/$"
46-
--exclude "^https://zenodo.org/badge/DOI/10.5281/zenodo$"
47-
--exclude "^https://github.com/GenericMappingTools/pygmt/pull/[0-9]*$"
48-
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/[0-9]*$"
45+
--exclude "^https://docs.generic-mapping-tools.org/6.[0-9]?/%s$"
46+
--exclude "^https://docs.generic-mapping-tools.org/6.[0-9]?/%3Cmodule-name%3E.html$"
47+
--exclude "^https://doi.org"
4948
--exclude "^https://github.com/GenericMappingTools/gmt/releases/tag/X.Y.Z$"
5049
--exclude "^https://github.com/GenericMappingTools/pygmt/edit"
5150
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/new"
51+
--exclude "^https://github.com/GenericMappingTools/pygmt/pull/[0-9]*$"
52+
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/[0-9]*$"
5253
--exclude "^https://github.com/GenericMappingTools/pygmt/releases/tag/%7B%7Bpath%7D%7D"
53-
--exclude "^https://www.pygmt.org/%7B%7Bpath%7D%7D"
54-
--exclude "^git"
55-
--exclude "^file://"
56-
--exclude "https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf"
57-
--exclude "^https://docs.generic-mapping-tools.org/6.5/%s$"
58-
--exclude "^https://docs.generic-mapping-tools.org/6.5/%3Cmodule-name%3E.html$"
59-
--exclude "^https://www.generic-mapping-tools.org/remote-datasets/%s$"
6054
--exclude "^https://hackmd.io/@pygmt"
61-
--exclude "^https://doi.org"
62-
--exclude "^https://www.researchgate.net/"
6355
--exclude "^https://test.pypi.org/simple/"
56+
--exclude "^https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf"
57+
--exclude "^https://www.generic-mapping-tools.org/remote-datasets/%s$"
58+
--exclude "^https://www.pygmt.org/%7B%7Bpath%7D%7D"
59+
--exclude "^https://www.researchgate.net/"
60+
--exclude "^https://zenodo.org/badge/DOI/"
6461
--verbose
6562
"repository/**/*.rst"
6663
"repository/**/*.md"

.github/workflows/ci_docs.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
steps:
7070
# Checkout current git repository
7171
- name: Checkout
72-
uses: actions/checkout@v4.1.7
72+
uses: actions/checkout@v4.2.2
7373
with:
7474
# fetch all history so that setuptools-scm works
7575
fetch-depth: 0
@@ -80,7 +80,7 @@ jobs:
8080

8181
# Install Micromamba with conda-forge dependencies
8282
- name: Setup Micromamba
83-
uses: mamba-org/setup-micromamba@v1.9.0
83+
uses: mamba-org/setup-micromamba@v2.0.1
8484
with:
8585
environment-name: pygmt
8686
condarc: |
@@ -103,6 +103,7 @@ jobs:
103103
contextily
104104
geopandas<1.0
105105
ipython
106+
pyarrow
106107
rioxarray
107108
make
108109
pip
@@ -114,7 +115,7 @@ jobs:
114115
sphinx-copybutton
115116
sphinx-design
116117
sphinx-gallery
117-
sphinx_rtd_theme
118+
sphinx_rtd_theme<3.0
118119
119120
# Download cached remote files (artifacts) from GitHub
120121
- name: Download remote data from GitHub
@@ -138,7 +139,7 @@ jobs:
138139
run: make -C doc clean all
139140

140141
- name: Checkout the gh-pages branch
141-
uses: actions/checkout@v4.1.7
142+
uses: actions/checkout@v4.2.2
142143
with:
143144
ref: gh-pages
144145
# Checkout to this folder instead of the current one

.github/workflows/ci_doctests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
steps:
3636
# Checkout current git repository
3737
- name: Checkout
38-
uses: actions/checkout@v4.1.7
38+
uses: actions/checkout@v4.2.2
3939
with:
4040
# fetch all history so that setuptools-scm works
4141
fetch-depth: 0
4242

4343
# Install Micromamba with conda-forge dependencies
4444
- name: Setup Micromamba
45-
uses: mamba-org/setup-micromamba@v1.9.0
45+
uses: mamba-org/setup-micromamba@v2.0.1
4646
with:
4747
environment-name: pygmt
4848
condarc: |

0 commit comments

Comments
 (0)