Skip to content

Commit 067d6bb

Browse files
committed
Merge branch 'main' into AliasSystem/params/frame
2 parents fad1d47 + 2b96907 commit 067d6bb

24 files changed

+110
-154
lines changed

.github/workflows/check-links.yml

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

4141
- name: Link Checker
4242
id: lychee
43-
uses: lycheeverse/lychee-action@5c4ee84814c983aa7164eaee476f014e53ff3963 # v2.5.0
43+
uses: lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2 # v2.6.1
4444
with:
4545
fail: false # Don't fail action on broken links
4646
output: /tmp/lychee-out.md

.github/workflows/ci_tests.yaml

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

188188
# Upload coverage to Codecov
189189
- name: Upload coverage to Codecov
190-
uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
190+
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
191191
if: success() || failure()
192192
with:
193193
use_oidc: true

.github/workflows/ci_tests_dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
os: [ubuntu-24.04, ubuntu-24.04-arm, macos-15, windows-2025]
41+
os: [ubuntu-24.04, ubuntu-24.04-arm, macos-26, windows-2025]
4242
gmt_git_ref: [master]
4343
timeout-minutes: 30
4444
defaults:

.github/workflows/format-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
# Install formatting tools
3939
- name: Install formatting tools
4040
run: |
41-
python -m pip install ruff pre-commit
41+
python -m pip install ruff prek
4242
python -m pip list
4343
4444
# Run "make format" and commit the change to the PR branch

.github/workflows/style_checks.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ jobs:
3838

3939
- name: Install packages
4040
run: |
41-
python -m pip install ruff pre-commit
41+
python -m pip install ruff prek
4242
python -m pip list
4343
44-
- name: Formatting check (ruff + pre-commit)
44+
- name: Formatting check (ruff + prek)
4545
run: |
4646
make check
47-
pre-commit run --all-files
47+
prek run --all-files
4848
4949
- name: Ensure example scripts have at least one code block separator
5050
run: |

AUTHORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This project was started in 2017 by [Leonardo Uieda](https://www.leouieda.com)
44
during [an NSF funded postdoc](https://www.leouieda.com/blog/hawaii-gmt-postdoc)
5-
with [Paul Wessel](https://www.soest.hawaii.edu/wessel) at the University of
5+
with [Paul Wessel](https://en.wikipedia.org/wiki/Pål_Wessel) at the University of
66
Hawaiʻi at Mānoa.
77

88
The following people have contributed code and/or documentation to the project

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ test_no_images: _runtest
6161
format:
6262
ruff check --fix --exit-zero $(FORMAT_FILES)
6363
ruff format $(FORMAT_FILES)
64-
pre-commit run --all-files
64+
prek run --all-files
6565

6666
check:
6767
ruff check $(FORMAT_FILES)

doc/contributing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -481,10 +481,10 @@ the code yourself. Before committing, run it to automatically format your code:
481481
make format
482482
```
483483

484-
For consistency, we also use `pre-commit` hooks to enforce UNIX-style line endings
485-
(`\n`) and file permission 644 (`-rw-r--r--`) throughout the whole project.
486-
Don't worry if you forget to do it. Our continuous integration systems will
487-
warn us and you can make a new commit with the formatted code.
484+
For consistency, we also use `pre-commit` hooks (via [`prek`](https://prek.j178.dev/))
485+
to enforce UNIX-style line endings (`\n`) and file permission 644 (`-rw-r--r--`)
486+
throughout the whole project. Don't worry if you forget to do it. Our continuous
487+
integration systems will warn us and you can make a new commit with the formatted code.
488488
Even better, you can just write `/format` in the first line of any comment in a
489489
pull request to lint the code automatically.
490490

doc/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ contact with the original PostScript files and get only the more convenient form
1919
PDF and PNG.
2020

2121
The project was started in 2017 by [Leonardo Uieda](https://www.leouieda.com) and
22-
[Paul Wessel](https://www.soest.hawaii.edu/wessel) (the co-creator and main developer of
23-
GMT) at the University of Hawaiʻi at Mānoa. The development of PyGMT has been supported
24-
by NSF grants [OCE-1558403](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1558403)
22+
[Paul Wessel](https://en.wikipedia.org/wiki/Pål_Wessel) (the co-creator and main
23+
developer of GMT) at the University of Hawaiʻi at Mānoa. The development of PyGMT
24+
has been supported by NSF grants [OCE-1558403](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1558403)
2525
and [EAR-1948602](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1948602).
2626

2727
We welcome any feedback and ideas! Let us know by submitting

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
- python-build
2626
# Dev dependencies (style checks)
2727
- codespell
28-
- pre-commit
28+
- prek
2929
- ruff>=0.12.0
3030
# Dev dependencies (unit testing)
3131
- matplotlib-base

0 commit comments

Comments
 (0)