Skip to content

Commit 9da10a1

Browse files
SunPyBotCadair
andauthored
Updates from package template (#201)
* Update cruft with batchpr * Update .pre-commit-config.yaml * Update README.rst * Apply suggestion from @Cadair * Remove unused cron triggerer * update stale bot --------- Co-authored-by: Stuart Mumford <stuart@cadair.com>
1 parent b2a7b11 commit 9da10a1

8 files changed

Lines changed: 104 additions & 49 deletions

File tree

.cruft.json

Lines changed: 3 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": "4268346dead7b529a3d53df19bcf374bb2bbef34",
3+
"commit": "9599f755e4f7880fe20f0f07bbf500d8c41de34d",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
@@ -23,6 +23,7 @@
2323
"include_example_code": "n",
2424
"include_cruft_update_github_workflow": "y",
2525
"use_extended_ruff_linting": "y",
26+
"matrix_room_id": "",
2627
"_sphinx_theme": "sunpy",
2728
"_parent_project": "",
2829
"_install_requires": "",
@@ -32,7 +33,7 @@
3233
".github/workflows/sub_package_update.yml"
3334
],
3435
"_template": "https://github.com/sunpy/package-template",
35-
"_commit": "4268346dead7b529a3d53df19bcf374bb2bbef34"
36+
"_commit": "9599f755e4f7880fe20f0f07bbf500d8c41de34d"
3637
}
3738
},
3839
"directory": null

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
cooldown:
8+
default-days: 7

.github/workflows/ci.yml

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ concurrency:
2727
group: ${{ github.workflow }}-${{ github.ref }}
2828
cancel-in-progress: true
2929

30+
permissions: {}
31+
3032
jobs:
3133
core:
32-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2
34+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2 # zizmor: ignore[unpinned-uses]
3335
with:
3436
submodules: false
3537
coverage: codecov
@@ -43,8 +45,10 @@ jobs:
4345
sdist_verify:
4446
runs-on: ubuntu-latest
4547
steps:
46-
- uses: actions/checkout@v6
47-
- uses: actions/setup-python@v6
48+
- uses: actions/checkout@v6 # zizmor: ignore[unpinned-uses]
49+
with:
50+
persist-credentials: false
51+
- uses: actions/setup-python@v6 # zizmor: ignore[unpinned-uses]
4852
with:
4953
python-version: '3.13'
5054
- run: python -m pip install -U --user build
@@ -54,7 +58,7 @@ jobs:
5458

5559
test:
5660
needs: [core, sdist_verify]
57-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2
61+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2 # zizmor: ignore[unpinned-uses]
5862
with:
5963
submodules: false
6064
coverage: codecov
@@ -71,7 +75,7 @@ jobs:
7175

7276
docs:
7377
needs: [core]
74-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2
78+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v2 # zizmor: ignore[unpinned-uses]
7579
with:
7680
default_python: '3.13'
7781
submodules: false
@@ -88,7 +92,7 @@ jobs:
8892
envs: |
8993
- linux: build_docs
9094
91-
publish:
95+
build_dists:
9296
# Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.*
9397
# see https://github-actions-workflows.openastronomy.org/en/latest/publish.html#upload-to-pypi
9498
if: |
@@ -98,11 +102,33 @@ jobs:
98102
contains(github.event.pull_request.labels.*.name, 'Run publish')
99103
)
100104
needs: [test, docs]
101-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v2
105+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v2 # zizmor: ignore[unpinned-uses]
102106
with:
103107
python-version: '3.13'
104108
test_extras: 'tests'
105109
test_command: 'pytest -p no:warnings --doctest-rst --pyargs sunpy_soar'
106110
submodules: false
107-
secrets:
108-
pypi_token: ${{ secrets.pypi_token }}
111+
save_artifacts: true
112+
upload_to_pypi: false
113+
114+
publish:
115+
if: startsWith(github.ref, 'refs/tags/v')
116+
name: Upload to PyPI
117+
runs-on: ubuntu-latest
118+
needs: [build_dists]
119+
permissions:
120+
id-token: write
121+
environment:
122+
name: pypi
123+
steps:
124+
- name: Download artifacts
125+
uses: actions/download-artifact@v8 # zizmor: ignore[unpinned-uses]
126+
with:
127+
merge-multiple: true
128+
pattern: dist-*
129+
path: dist
130+
131+
- run: ls -lha dist/
132+
133+
- name: Run upload
134+
uses: pypa/gh-action-pypi-publish@v1.13.0 # zizmor: ignore[unpinned-uses]

.github/workflows/scheduled_builds.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/stale_bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/stale@v8
19+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
2020
with:
2121
repo-token: ${{ secrets.GITHUB_TOKEN }}
2222
operations-per-run: 50

.github/workflows/sub_package_update.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@ on:
1313
# │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT)
1414
- cron: '0 7 * * 1' # Every Monday at 7am UTC
1515

16+
permissions: {}
17+
1618
jobs:
1719
update:
1820
runs-on: ubuntu-latest
1921
permissions:
2022
contents: write
2123
pull-requests: write
22-
strategy:
23-
fail-fast: true
2424
steps:
25-
- uses: actions/checkout@v6
25+
- uses: actions/checkout@v6 # zizmor: ignore[unpinned-uses]
26+
with:
27+
persist-credentials: false
2628

27-
- uses: actions/setup-python@v6
29+
- uses: actions/setup-python@v6 # zizmor: ignore[unpinned-uses]
2830
with:
2931
python-version: "3.14"
3032

@@ -50,8 +52,8 @@ jobs:
5052
id: cruft_update
5153
if: steps.check.outputs.has_changes == '1'
5254
run: |
53-
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
54-
git config --global user.name "${{ github.actor }}"
55+
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
56+
git config --global user.name "${GITHUB_ACTOR}"
5557
5658
cruft_output=$(cruft update --skip-apply-ask --refresh-private-variables)
5759
echo $cruft_output
@@ -77,7 +79,7 @@ jobs:
7779
7880
- name: Create pull request
7981
if: steps.cruft_json.outputs.has_changes == '1'
80-
uses: peter-evans/create-pull-request@v8
82+
uses: peter-evans/create-pull-request@v8 # zizmor: ignore[unpinned-uses]
8183
with:
8284
token: ${{ secrets.GITHUB_TOKEN }}
8385
add-paths: "."
@@ -102,7 +104,7 @@ jobs:
102104
issues: write
103105
steps:
104106
- name: Open an issue if workflow fails
105-
uses: actions/github-script@v7
107+
uses: actions/github-script@v8 # zizmor: ignore[unpinned-uses]
106108
with:
107109
github-token: ${{ github.token }}
108110
# This script is adapted from https://github.com/scientific-python/issue-from-pytest-log-action
@@ -150,7 +152,7 @@ jobs:
150152
repo: variables.name,
151153
body: issue_body,
152154
title: variables.title,
153-
labels: [variables.label],
155+
labels: [variables.label, "pre-commit.ci autofix"],
154156
});
155157
} else {
156158
await github.rest.issues.update({

.pre-commit-config.yaml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,56 @@
11
repos:
2+
- repo: https://github.com/zizmorcore/zizmor-pre-commit
3+
rev: v1.23.1
4+
hooks:
5+
- id: zizmor
26
# This should be before any formatting hooks like isort
37
- repo: https://github.com/astral-sh/ruff-pre-commit
48
rev: "v0.15.4"
59
hooks:
610
- id: ruff
711
args: ["--fix"]
12+
types: [python]
13+
# Define here once and then reference using YAML anchor
14+
exclude: &exclude_dirs ^sunpy_soar/(data|extern)/
815
- repo: https://github.com/PyCQA/isort
916
rev: 8.0.1
1017
hooks:
1118
- id: isort
12-
exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|extern.*|{{ cookiecutter.module_name }}/extern)$"
19+
types: [python]
20+
exclude: *exclude_dirs
1321
- repo: https://github.com/pre-commit/pre-commit-hooks
1422
rev: v6.0.0
1523
hooks:
1624
- id: check-ast
25+
types: [python]
26+
exclude: *exclude_dirs
1727
- id: check-case-conflict
28+
types: [python]
29+
exclude: *exclude_dirs
1830
- id: trailing-whitespace
19-
exclude: ".*(.fits|.fts|.fit|.header|.txt)$"
31+
types_or: [python, rst]
2032
- id: check-yaml
33+
types: [yaml]
34+
exclude: *exclude_dirs
35+
- id: check-toml
36+
types: [toml]
37+
exclude: *exclude_dirs
2138
- id: debug-statements
39+
types: [python]
40+
exclude: *exclude_dirs
2241
- id: check-added-large-files
2342
args: ["--enforce-all", "--maxkb=1054"]
2443
- id: end-of-file-fixer
25-
exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|.json)$|^CITATION.rst$"
44+
types_or: [python, rst]
2645
- id: mixed-line-ending
27-
exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*)$"
46+
types_or: [python, rst]
2847
- repo: https://github.com/codespell-project/codespell
2948
rev: v2.4.1
3049
hooks:
3150
- id: codespell
3251
args: [ "--write-changes" ]
52+
types_or: [python, rst]
53+
exclude: *exclude_dirs
3354
ci:
3455
autofix_prs: false
3556
autoupdate_schedule: "quarterly"

README.rst

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
**************
2-
``sunpy-soar``
3-
**************
1+
A sunpy FIDO plugin for accessing data in the Solar Orbiter Archive (SOAR).
2+
===========================================================================
43

54
|ci-status| |coverage|
65

76
.. |ci-status| image:: https://github.com/sunpy/sunpy-soar/actions/workflows/ci.yml/badge.svg
87
:alt: CI status
9-
108
.. |coverage| image:: https://codecov.io/gh/sunpy/sunpy-soar/branch/main/graph/badge.svg?token=5NKZHBX3AW
119
:target: https://codecov.io/gh/sunpy/sunpy-soar
1210
:alt: Code coverage
@@ -22,3 +20,22 @@ We expect authentic engagement in our community.
2220
**Do not post the output from Large Language Models or similar generative AI as code, issues or comments on GitHub or any other platform.**
2321
If you use generative AI tools as an aid in developing code or documentation changes, ensure that you fully understand the proposed changes and can explain why they are the correct approach and an improvement to the current state.
2422
For more information see our documentation on fair and appropriate `AI usage <https://docs.sunpy.org/en/latest/dev_guide/contents/ai_usage.html>`__.
23+
24+
Contributing
25+
------------
26+
27+
We love contributions! sunpy-soar is open source,
28+
built on open source, and we'd love to have you hang out in our community.
29+
30+
If you would like to get involved, check out the `Developers Guide`_ section of the SunPy docs.
31+
Stop by our chat room `#sunpy:openastronomy.org`_ if you have any questions.
32+
Help is always welcome so let us know what you like to work on, or check out the `issues page`_ for the list of known outstanding items.
33+
34+
For more information on contributing to SunPy, please read our `Newcomers' guide`_.
35+
36+
.. _Developers Guide: https://docs.sunpy.org/en/latest/dev_guide/index.html
37+
.. _`#sunpy:openastronomy.org`: https://app.element.io/#/room/#sunpy:openastronomy.org
38+
.. _issues page: https://github.com/sunpy/sunpy-soar/issues
39+
.. _Newcomers' guide: https://docs.sunpy.org/en/latest/dev_guide/contents/newcomers.html
40+
41+
When you are interacting with the SunPy community you are asked at to follow our `code of conduct <https://sunpy.org/coc>`__.

0 commit comments

Comments
 (0)