Skip to content

Commit 6092c21

Browse files
seismanseisman
authored
Merge branch 'main' into feature/paragraph
2 parents 82f4811 + 538d006 commit 6092c21

23 files changed

Lines changed: 454 additions & 45 deletions

‎.github/dependabot.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ updates:
2424
labels:
2525
- "maintenance"
2626
- "skip-changelog"
27+
cooldown:
28+
default-days: 7

‎.github/workflows/benchmarks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
# Checkout current git repository
3838
- name: Checkout
39-
uses: actions/checkout@v6.0.1
39+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4040
with:
4141
# fetch all history so that setuptools-scm works
4242
fetch-depth: 0
@@ -48,7 +48,7 @@ jobs:
4848

4949
# Install Micromamba with conda-forge dependencies
5050
- name: Setup Micromamba
51-
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
51+
uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
5252
with:
5353
environment-name: pygmt
5454
cache-environment: true

‎.github/workflows/cache_data.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ jobs:
3838
steps:
3939
# Checkout current git repository
4040
- name: Checkout
41-
uses: actions/checkout@v6.0.1
41+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4242
with:
4343
# fetch all history so that setuptools-scm works
4444
fetch-depth: 0
4545
persist-credentials: false
4646

4747
# Install Micromamba with conda-forge dependencies
4848
- name: Setup Micromamba
49-
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
49+
uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
5050
with:
5151
environment-name: pygmt
5252
create-args: >-
@@ -74,7 +74,7 @@ jobs:
7474

7575
# Upload the downloaded files as artifacts to GitHub
7676
- name: Upload artifacts to GitHub
77-
uses: actions/upload-artifact@v7.0.0
77+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7878
with:
7979
name: gmt-cache
8080
include-hidden-files: true

‎.github/workflows/cache_dvc.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ jobs:
2929
dvc_cache:
3030
name: Cache DVC baseline images
3131
runs-on: ubuntu-slim
32+
environment: pr-tests
3233
defaults:
3334
run:
3435
shell: bash -l {0}
3536

3637
steps:
3738
- name: Checkout
38-
uses: actions/checkout@v6.0.1
39+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3940
with:
4041
# fetch all history so that setuptools-scm works
4142
fetch-depth: 0
@@ -52,7 +53,7 @@ jobs:
5253
dvc pull --no-run-cache --verbose && ls -lhR pygmt/tests/baseline/
5354
5455
- name: Upload DVC cache as artifacts to GitHub
55-
uses: actions/upload-artifact@v7.0.0
56+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5657
with:
5758
name: dvc-cache
5859
include-hidden-files: true

‎.github/workflows/check-links.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626

2727
steps:
2828
- name: Checkout the repository
29-
uses: actions/checkout@v6.0.1
29+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3030
with:
3131
path: repository
3232
persist-credentials: false
3333

3434
- name: Checkout the documentation
35-
uses: actions/checkout@v6.0.1
35+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3636
with:
3737
ref: gh-pages
3838
path: documentation

‎.github/workflows/ci_docs.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
steps:
7373
# Checkout current git repository
7474
- name: Checkout
75-
uses: actions/checkout@v6.0.1
75+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7676
with:
7777
# fetch all history so that setuptools-scm works
7878
fetch-depth: 0
@@ -84,7 +84,7 @@ jobs:
8484

8585
# Install Micromamba with conda-forge dependencies
8686
- name: Setup Micromamba
87-
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
87+
uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
8888
with:
8989
environment-name: pygmt
9090
cache-environment: true
@@ -150,7 +150,7 @@ jobs:
150150
cd ../..
151151
152152
- name: Upload PDF as artifact for previewing on pull requests
153-
uses: actions/upload-artifact@v7.0.0
153+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
154154
if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
155155
with:
156156
name: artifact-pygmt-docs-pdf
@@ -168,7 +168,7 @@ jobs:
168168
REF_NAME: ${{ github.ref_name }}
169169

170170
- name: Checkout the gh-pages branch
171-
uses: actions/checkout@v6.0.1
171+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
172172
with:
173173
ref: gh-pages
174174
# 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
@@ -37,15 +37,15 @@ jobs:
3737
steps:
3838
# Checkout current git repository
3939
- name: Checkout
40-
uses: actions/checkout@v6.0.1
40+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4141
with:
4242
# fetch all history so that setuptools-scm works
4343
fetch-depth: 0
4444
persist-credentials: false
4545

4646
# Install Micromamba with conda-forge dependencies
4747
- name: Setup Micromamba
48-
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
48+
uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
4949
with:
5050
environment-name: pygmt
5151
create-args: >-

‎.github/workflows/ci_tests.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
steps:
108108
# Checkout current git repository
109109
- name: Checkout
110-
uses: actions/checkout@v6.0.1
110+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
111111
with:
112112
# fetch all history so that setuptools-scm works
113113
fetch-depth: 0
@@ -119,7 +119,7 @@ jobs:
119119

120120
# Install Micromamba with conda-forge dependencies
121121
- name: Setup Micromamba
122-
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
122+
uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
123123
with:
124124
environment-name: pygmt
125125
cache-environment: true
@@ -193,15 +193,15 @@ jobs:
193193

194194
# Upload diff images on test failure
195195
- name: Upload diff images if any test fails
196-
uses: actions/upload-artifact@v7.0.0
196+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
197197
if: failure()
198198
with:
199199
name: artifact-${{ matrix.os }}-${{ matrix.python-version }}
200200
path: tmp-test-dir-with-unique-name
201201

202202
# Upload coverage to Codecov
203203
- name: Upload coverage to Codecov
204-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
204+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
205205
if: success() || failure()
206206
with:
207207
use_oidc: true

‎.github/workflows/ci_tests_dev.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
test_gmt_dev:
3535
name: ${{ matrix.os }} - GMT ${{ matrix.gmt_git_ref }}
3636
runs-on: ${{ matrix.os }}
37+
environment: pr-tests
3738
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run/test-gmt-dev')
3839
strategy:
3940
fail-fast: false
@@ -48,7 +49,7 @@ jobs:
4849
steps:
4950
# Checkout current git repository
5051
- name: Checkout
51-
uses: actions/checkout@v6.0.1
52+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5253
with:
5354
# fetch all history so that setuptools-scm works
5455
fetch-depth: 0
@@ -60,7 +61,7 @@ jobs:
6061

6162
# Install Micromamba with conda-forge dependencies
6263
- name: Setup Micromamba
63-
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
64+
uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
6465
with:
6566
environment-name: pygmt
6667
cache-environment: true
@@ -94,7 +95,7 @@ jobs:
9495

9596
# Checkout current GMT repository
9697
- name: Checkout the GMT source from ${{ matrix.gmt_git_ref }} branch
97-
uses: actions/checkout@v6.0.1
98+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9899
with:
99100
repository: 'GenericMappingTools/gmt'
100101
ref: ${{ matrix.gmt_git_ref }}
@@ -187,7 +188,7 @@ jobs:
187188

188189
# Upload diff images on test failure
189190
- name: Upload diff images if any test fails
190-
uses: actions/upload-artifact@v7.0.0
191+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
191192
if: ${{ failure() }}
192193
with:
193194
name: artifact-${{ matrix.os }}-GMT-${{ matrix.gmt_git_ref }}

‎.github/workflows/ci_tests_legacy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ jobs:
4646
steps:
4747
# Checkout current git repository
4848
- name: Checkout
49-
uses: actions/checkout@v6.0.1
49+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5050
with:
5151
# fetch all history so that setuptools-scm works
5252
fetch-depth: 0
5353
persist-credentials: false
5454

5555
# Install Micromamba with conda-forge dependencies
5656
- name: Setup Micromamba
57-
uses: mamba-org/setup-micromamba@add3a49764cedee8ee24e82dfde87f5bc2914462 # v2.0.7
57+
uses: mamba-org/setup-micromamba@d7c9bd84e824b79d2af72a2d4196c7f4300d3476 # v3.0.0
5858
with:
5959
environment-name: pygmt
6060
create-args: >-

0 commit comments

Comments
 (0)