Skip to content

Commit aef5f01

Browse files
committed
Run cruft update from package template
1 parent c171a72 commit aef5f01

5 files changed

Lines changed: 39 additions & 8 deletions

File tree

.cruft.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/sunpy/package-template",
3-
"commit": "5c98b2c9fc7ea81ebdcbae21a76e52e3c959dc77",
3+
"commit": "35179454100c2f83118c49ac4a4a15e3c670365e",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
@@ -33,7 +33,7 @@
3333
".github/workflows/sub_package_update.yml"
3434
],
3535
"_template": "https://github.com/sunpy/package-template",
36-
"_commit": "5c98b2c9fc7ea81ebdcbae21a76e52e3c959dc77"
36+
"_commit": "35179454100c2f83118c49ac4a4a15e3c670365e"
3737
}
3838
},
3939
"directory": null

.github/workflows/ci.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,14 @@ jobs:
2727
<<<<<<<
2828
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
2929
=======
30+
<<<<<<<
3031
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3 # zizmor: ignore[unpinned-uses]
32+
>>>>>>>
33+
=======
34+
35+
jobs:
36+
core:
37+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
3138
>>>>>>>
3239
with:
3340
submodules: false
@@ -42,10 +49,14 @@ jobs:
4249
sdist_verify:
4350
runs-on: ubuntu-latest
4451
steps:
45-
- uses: actions/checkout@v7 # zizmor: ignore[unpinned-uses]
52+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4653
with:
4754
persist-credentials: false
55+
<<<<<<<
4856
- uses: actions/setup-python@v7 # zizmor: ignore[unpinned-uses]
57+
=======
58+
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
59+
>>>>>>>
4960
with:
5061
python-version: '3.13'
5162
- run: python -m pip install -U --user build
@@ -55,10 +66,14 @@ jobs:
5566

5667
test:
5768
needs: [core, sdist_verify]
69+
<<<<<<<
5870
<<<<<<<
5971
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
6072
=======
6173
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3 # zizmor: ignore[unpinned-uses]
74+
>>>>>>>
75+
=======
76+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
6277
>>>>>>>
6378
with:
6479
submodules: false
@@ -107,10 +122,14 @@ jobs:
107122

108123
docs:
109124
needs: [core]
125+
<<<<<<<
110126
<<<<<<<
111127
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
112128
=======
113129
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v3 # zizmor: ignore[unpinned-uses]
130+
>>>>>>>
131+
=======
132+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
114133
>>>>>>>
115134
with:
116135
default_python: '3.13'
@@ -206,7 +225,11 @@ jobs:
206225
contains(github.event.pull_request.labels.*.name, 'Run publish')
207226
)
208227
needs: [test, docs]
228+
<<<<<<<
209229
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v3.0.1 # zizmor: ignore[unpinned-uses]
230+
=======
231+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2
232+
>>>>>>>
210233
with:
211234
python-version: "3.13"
212235
test_extras: 'tests'
@@ -228,7 +251,7 @@ jobs:
228251
name: pypi
229252
steps:
230253
- name: Download artifacts
231-
uses: actions/download-artifact@v8 # zizmor: ignore[unpinned-uses]
254+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
232255
with:
233256
merge-multiple: true
234257
pattern: dist-*

.github/workflows/label_sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
runs-on: ubuntu-latest
1919
name: Label Sync
2020
steps:
21-
- uses: srealmoreno/label-sync-action@850ba5cef2b25e56c6c420c4feed0319294682fd
21+
- uses: srealmoreno/label-sync-action@850ba5cef2b25e56c6c420c4feed0319294682fd # v2.0.0
2222
with:
2323
config-file: https://raw.githubusercontent.com/sunpy/.github/main/labels.yml

.github/workflows/sub_package_update.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@ jobs:
2222
contents: write
2323
pull-requests: write
2424
steps:
25-
- uses: actions/checkout@v7 # zizmor: ignore[unpinned-uses]
25+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2626
with:
2727
persist-credentials: false
2828

29+
<<<<<<<
2930
- uses: actions/setup-python@v7 # zizmor: ignore[unpinned-uses]
31+
=======
32+
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
33+
>>>>>>>
3034
with:
3135
python-version: "3.14"
3236

@@ -79,7 +83,7 @@ jobs:
7983
8084
- name: Create pull request
8185
if: steps.cruft_json.outputs.has_changes == '1'
82-
uses: peter-evans/create-pull-request@v8 # zizmor: ignore[unpinned-uses]
86+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
8387
with:
8488
token: ${{ secrets.GITHUB_TOKEN }}
8589
add-paths: "."
@@ -107,7 +111,7 @@ jobs:
107111
issues: write
108112
steps:
109113
- name: Open an issue if workflow fails
110-
uses: actions/github-script@v9 # zizmor: ignore[unpinned-uses]
114+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
111115
with:
112116
github-token: ${{ github.token }}
113117
# This script is adapted from https://github.com/scientific-python/issue-from-pytest-log-action

tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ pass_env =
3838
# If the user has set a LC override we should follow it
3939
LC_ALL
4040
<<<<<<<
41+
<<<<<<<
4142
=======
4243
setenv =
44+
=======
45+
set_env =
46+
>>>>>>>
4347
COVERAGE_FILE={toxinidir}/.coverage
4448
MPLBACKEND = agg
4549
devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple

0 commit comments

Comments
 (0)