Skip to content

Commit 5cd8275

Browse files
seismanseisman
committed
Merge branch 'main' into refactor/virtualfile_in_extra_arrays
2 parents a7ee253 + 280595e commit 5cd8275

15 files changed

+188
-69
lines changed

‎.github/workflows/check-links.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ on:
1515
schedule:
1616
- cron: '0 12 * * 0'
1717

18-
permissions: {}
18+
permissions:
19+
issues: write
1920

2021
jobs:
2122
check_links:
@@ -49,11 +50,14 @@ jobs:
4950
--exclude "^https://docs.generic-mapping-tools.org/6.[0-9]?/%s$"
5051
--exclude "^https://docs.generic-mapping-tools.org/6.[0-9]?/%3Cmodule-name%3E.html$"
5152
--exclude "^https://doi.org"
53+
--exclude "^https://github.com/%7Brepository%7D"
5254
--exclude "^https://github.com/GenericMappingTools/gmt/releases/tag/X.Y.Z$"
5355
--exclude "^https://github.com/GenericMappingTools/pygmt/edit"
5456
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/new"
5557
--exclude "^https://github.com/GenericMappingTools/pygmt/pull/[0-9]*$"
5658
--exclude "^https://github.com/GenericMappingTools/pygmt/issues/[0-9]*$"
59+
--exclude "^https://github.com/GenericMappingTools/pygmt/releases/download/%7B%7Bpath%7D%7D/pygmt-docs.pdf"
60+
--exclude "^https://github.com/GenericMappingTools/pygmt/releases/download/%7B%7Bpath%7D%7D/pygmt-docs.zip"
5761
--exclude "^https://github.com/GenericMappingTools/pygmt/releases/tag/%7B%7Bpath%7D%7D"
5862
--exclude "^https://hackmd.io/@pygmt"
5963
--exclude "^https://test.pypi.org/simple/"
@@ -62,6 +66,8 @@ jobs:
6266
--exclude "^https://www.pygmt.org/%7B%7Bpath%7D%7D"
6367
--exclude "^https://www.researchgate.net/"
6468
--exclude "^https://zenodo.org/badge/DOI/"
69+
--exclude-path "repository/doc/**/*.rst"
70+
--exclude-path "repository/doc/**/*.md"
6571
--verbose
6672
"repository/**/*.rst"
6773
"repository/**/*.md"
@@ -73,7 +79,7 @@ jobs:
7379
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
7480

7581
- name: Create Issue From File
76-
if: env.lychee_exit_code != 0
82+
if: ${{ steps.lychee.outputs.exit_code }} != 0
7783
run: |
7884
cd repository/
7985
title="Link Checker Report on ${CURRENT_DATE}"

‎.github/workflows/ci_docs.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
#
33
# This workflow builds the documentation on Linux/macOS/Windows.
44
#
5-
# It is run on every commit to the main and pull request branches, and also
6-
# when a new release is published.
7-
# In draft pull requests, only the job on Linux is triggered to save on
8-
# Continuous Integration resources.
5+
# It is run on every commit to the main and pull request branches, and also when a new
6+
# release is published. In draft pull requests, only the job on Linux is triggered to
7+
# save on Continuous Integration resources.
98
#
109
# On the main branch, the workflow also handles the documentation deployment:
1110
#
12-
# * Updating the development documentation by pushing the built HTML pages
13-
# from the main branch onto the dev folder of the gh-pages branch.
11+
# * Updating the development documentation by pushing the built HTML pages from the main
12+
# branch onto the dev folder of the gh-pages branch.
1413
# * Updating the latest documentation link to the new release.
1514
#
1615
name: Docs
@@ -43,7 +42,8 @@ concurrency:
4342
group: ${{ github.workflow }}-${{ github.ref }}
4443
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
4544

46-
permissions: {}
45+
permissions:
46+
contents: write
4747

4848
jobs:
4949
docs:
@@ -176,7 +176,7 @@ jobs:
176176
path: deploy
177177
# Download the entire history
178178
fetch-depth: 0
179-
persist-credentials: false
179+
persist-credentials: true
180180
if: (github.event_name == 'release' || github.event_name == 'push') && (matrix.os == 'ubuntu-latest')
181181

182182
- name: Push the built HTML to gh-pages

‎.github/workflows/ci_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
GH_TOKEN: ${{ github.token }}
153153

154154
- name: Install uv
155-
uses: astral-sh/setup-uv@v5.3.1
155+
uses: astral-sh/setup-uv@v5.4.0
156156
with:
157157
python-version: ${{ matrix.python-version }}
158158

‎.github/workflows/format-command.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
repository_dispatch:
99
types: [format-command]
1010

11-
permissions: {}
11+
permissions:
12+
contents: write
1213

1314
jobs:
1415
format:
@@ -30,7 +31,7 @@ jobs:
3031
persist-credentials: false
3132

3233
# Setup Python environment
33-
- uses: actions/setup-python@v5.4.0
34+
- uses: actions/setup-python@v5.5.0
3435
with:
3536
python-version: '3.13'
3637

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
persist-credentials: false
5151

5252
- name: Set up Python
53-
uses: actions/setup-python@v5.4.0
53+
uses: actions/setup-python@v5.5.0
5454
with:
5555
python-version: '3.13'
5656

‎.github/workflows/release-drafter.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Draft the next release notes
22
#
3-
# This workflow is run to update the next release notes as pull requests are
4-
# merged into the main branch. The configuration file is located at
5-
# `.github/release-drafter.yml`.
3+
# This workflow is run to update the next release notes as pull requests are merged into
4+
# the main branch. The configuration file is located at `.github/release-drafter.yml`.
65
#
76
name: Release Drafter
87

@@ -11,10 +10,14 @@ on:
1110
branches:
1211
- main
1312

14-
permissions: {}
13+
permissions:
14+
contents: read
1515

1616
jobs:
1717
update_release_draft:
18+
permissions:
19+
# write permission is required to create a github release
20+
contents: write
1821
runs-on: ubuntu-latest
1922
if: github.repository == 'GenericMappingTools/pygmt'
2023

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ on:
1010
# Add "edited" type for test purposes. Where possible, avoid using to prevent processing unnecessary events.
1111
# types: [created, edited]
1212

13-
permissions: {}
13+
permissions:
14+
issues: write
1415

1516
jobs:
1617
slashCommandDispatch:

‎.github/workflows/style_checks.yaml

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

3333
# Setup Python
3434
- name: Set up Python
35-
uses: actions/setup-python@v5.4.0
35+
uses: actions/setup-python@v5.5.0
3636
with:
3737
python-version: '3.13'
3838

‎.github/workflows/type_checks.yml

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

4242
# Setup Python
4343
- name: Set up Python
44-
uses: actions/setup-python@v5.4.0
44+
uses: actions/setup-python@v5.5.0
4545
with:
4646
python-version: '3.13'
4747

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![Compatible Python versions](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2FGenericMappingTools%2Fpygmt%2Frefs%2Fheads%2Fmain%2Fpyproject.toml)](https://www.pygmt.org/dev/minversions.html)
1111
[![Digital Object Identifier for the Zenodo archive](https://zenodo.org/badge/DOI/10.5281/3781524.svg)](https://doi.org/10.5281/zenodo.3781524)
1212
[![Discourse forum](https://img.shields.io/discourse/status?label=forum&server=https%3A%2F%2Fforum.generic-mapping-tools.org)](https://forum.generic-mapping-tools.org)
13-
[![PyOpenSci](https://tinyurl.com/y22nb8up)](https://github.com/pyOpenSci/software-review/issues/43)
13+
[![PyOpenSci](https://tinyurl.com/y22nb8up)](https://github.com/pyOpenSci/software-submission/issues/43)
1414
[![Contributor Code of Conduct](https://img.shields.io/badge/Contributor%20Covenant-v2.1%20adopted-ff69b4.svg)](https://github.com/GenericMappingTools/.github/blob/main/CODE_OF_CONDUCT.md)
1515
[![GitHub Actions Tests status](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests.yaml/badge.svg)](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests.yaml)
1616
[![GitHub Actions GMT Dev Tests status](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_dev.yaml/badge.svg)](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_dev.yaml)

0 commit comments

Comments
 (0)