From 0520a57d74d90abbf71dd8284f8b73054fe2259d Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Wed, 12 Aug 2026 10:09:46 +0000 Subject: [PATCH 1/6] Run cruft update from package template --- .cruft.json | 4 ++-- .github/workflows/ci.yml | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.cruft.json b/.cruft.json index 3e1f70069..e6f83631e 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "4ba8b7c6a6bf4f51f7154978ae8d2f3710ef89e5", + "commit": "dce4f87cccac0059526182851a3b3e0b069b7a47", "checkout": null, "context": { "cookiecutter": { @@ -34,7 +34,7 @@ "docs/_static" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "4ba8b7c6a6bf4f51f7154978ae8d2f3710ef89e5" + "_commit": "dce4f87cccac0059526182851a3b3e0b069b7a47" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 606bce804..0b6e091e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,14 +25,20 @@ permissions: {} jobs: core: uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2 + permissions: + id-token: write with: submodules: false - coverage: codecov + coverage: codecov-oidc toxdeps: tox-pypi-filter envs: | +<<<<<<< - linux: py313-minimal secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} +======= + - linux: py313 +>>>>>>> sdist_verify: runs-on: ubuntu-latest @@ -51,19 +57,26 @@ jobs: test: needs: [core, sdist_verify] uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2 + permissions: + id-token: write with: submodules: false - coverage: codecov + coverage: codecov-oidc toxdeps: tox-pypi-filter posargs: -n auto envs: | - linux: py314 - windows: py312 - macos: py312 +<<<<<<< - linux: py311-oldestdeps - linux: asdf_schemas secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} +======= + - linux: py312-oldestdeps + - linux: py314-devdeps +>>>>>>> docs: needs: [core] @@ -93,10 +106,16 @@ jobs: ) needs: [core] uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2 + permissions: + id-token: write with: submodules: false toxdeps: tox-pypi-filter +<<<<<<< coverage: codecov +======= + coverage: codecov-oidc +>>>>>>> envs: | - linux: py314-devdeps secrets: From fd5c2c266224672d905b4daceab35a4327746c5a Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 12 Aug 2026 10:40:18 +0000 Subject: [PATCH 2/6] Update ci.yml --- .github/workflows/ci.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b6e091e5..b92d40ae3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,13 +32,7 @@ jobs: coverage: codecov-oidc toxdeps: tox-pypi-filter envs: | -<<<<<<< - linux: py313-minimal - secrets: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} -======= - - linux: py313 ->>>>>>> sdist_verify: runs-on: ubuntu-latest @@ -68,15 +62,8 @@ jobs: - linux: py314 - windows: py312 - macos: py312 -<<<<<<< - linux: py311-oldestdeps - linux: asdf_schemas - secrets: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} -======= - - linux: py312-oldestdeps - - linux: py314-devdeps ->>>>>>> docs: needs: [core] @@ -111,15 +98,9 @@ jobs: with: submodules: false toxdeps: tox-pypi-filter -<<<<<<< - coverage: codecov -======= coverage: codecov-oidc ->>>>>>> envs: | - linux: py314-devdeps - secrets: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} build_dists: # Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.* From 8e3b1731645dd757e9d085f7147ee6817b9a0bfa Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Wed, 12 Aug 2026 10:45:42 +0000 Subject: [PATCH 3/6] Run cruft update from package template --- .cruft.json | 7 ++++--- .github/workflows/zizmor.yml | 24 ++++++++++++++++++++++++ .pre-commit-config.yaml | 4 ---- 3 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/zizmor.yml diff --git a/.cruft.json b/.cruft.json index e6f83631e..74919abec 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "dce4f87cccac0059526182851a3b3e0b069b7a47", + "commit": "a01979d4c0ca04d0f41cbb062c767b6a400f5556", "checkout": null, "context": { "cookiecutter": { @@ -31,10 +31,11 @@ "_install_requires": "", "_copy_without_render": [ "docs/_templates", - "docs/_static" + "docs/_static", + ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "dce4f87cccac0059526182851a3b3e0b069b7a47" + "_commit": "a01979d4c0ca04d0f41cbb062c767b6a400f5556" } }, "directory": null diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml new file mode 100644 index 000000000..b7eced86e --- /dev/null +++ b/.github/workflows/zizmor.yml @@ -0,0 +1,24 @@ +name: GitHub Actions Security Analysis with zizmor + +on: + push: + branches: ["main"] + pull_request: + branches: ["**"] + +permissions: {} + +jobs: + zizmor: + runs-on: ubuntu-latest + permissions: + security-events: write + + steps: + - name: Checkout repository + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Run zizmor 🌈 + uses: zizmorcore/zizmor-action@6fc4b006235f201fdab3722e17240ab420d580e5 # v0.6.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 67b3b8962..94e63d63a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,8 +1,4 @@ repos: - - repo: https://github.com/zizmorcore/zizmor-pre-commit - rev: v1.28.0 - hooks: - - id: zizmor # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit rev: "v0.16.1" From 60013f1d4d34dc0fe9ca0431b7a12e6bba892502 Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Wed, 12 Aug 2026 12:02:42 +0000 Subject: [PATCH 4/6] Run cruft update from package template --- .cruft.json | 4 ++-- .github/workflows/zizmor.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index 74919abec..d8c86549a 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "a01979d4c0ca04d0f41cbb062c767b6a400f5556", + "commit": "9fff6e66fecd5ab2ed7fefbc0687791e83f46a8a", "checkout": null, "context": { "cookiecutter": { @@ -35,7 +35,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "a01979d4c0ca04d0f41cbb062c767b6a400f5556" + "_commit": "9fff6e66fecd5ab2ed7fefbc0687791e83f46a8a" } }, "directory": null diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index b7eced86e..777801f3c 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -21,4 +21,4 @@ jobs: persist-credentials: false - name: Run zizmor 🌈 - uses: zizmorcore/zizmor-action@6fc4b006235f201fdab3722e17240ab420d580e5 # v0.6.1 + uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2 From d3a27e5b08a36a18e4cfdf1a89bd0711ff7afca2 Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Tue, 18 Aug 2026 10:19:52 +0000 Subject: [PATCH 5/6] Run cruft update from package template --- .cruft.json | 5 ++-- .github/PULL_REQUEST_TEMPLATE.md | 49 ++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.cruft.json b/.cruft.json index d8c86549a..994b79d1c 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "9fff6e66fecd5ab2ed7fefbc0687791e83f46a8a", + "commit": "2a6434a5c749ecde69d00b937a3fef27ecbad656", "checkout": null, "context": { "cookiecutter": { @@ -26,6 +26,7 @@ "use_extended_ruff_linting": "y", "matrix_room_id": "!TWSJXVpyflnZOzmSQz:matrix.org", "extra_ci_jobs": "cron", + "use_sunpy_pr_template": "y", "_sphinx_theme": "sunpy", "_parent_project": "", "_install_requires": "", @@ -35,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "9fff6e66fecd5ab2ed7fefbc0687791e83f46a8a" + "_commit": "2a6434a5c749ecde69d00b937a3fef27ecbad656" } }, "directory": null diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..79183a10f --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,49 @@ +# Thank you for contributing to SunPy + +## 🚨 IMPORTANT 🚨 + +We know that working on code and submitting pull requests takes effort, and we appreciate your time. +Thank you. + +[Please be aware that everyone has to follow our code of conduct](https://sunpy.org/coc) + +[Furthermore, you might need to check with your work place if you are allowed to contribute code](https://docs.sunpy.org/en/latest/dev_guide/contents/newcomers.html) + +- Please try to create an issue _before_ creating a Pull Request. +- Please use the following Git commit message style + - Use the future tense ("Adds feature" not "Added feature") + - Limit the first line to 72 characters or less +- **Do not post the output from Large Language Models or similar generative AI as code or comments on GitHub or any other platform.** + 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. + See our documentation on fair and appropriate [AI usage](https://docs.sunpy.org/en/latest/dev_guide/contents/ai_usage.html). + +We have several automatic features that run when a pull request is open. +They can appear daunting but do not worry about them! +[This a brief explanation of them.](https://docs.sunpy.org/en/latest/dev_guide/contents/pr_review_procedure.html#continuous-integration) + +## ↑👆 DELETE above _before_ submitting 👆↑ + +## PR Description + + + +## AI Assistance Disclosure + + + +AI tools were used for: +- [ ] Code generation (e.g., when writing an implementation or fixing a bug) +- [ ] Test/benchmark generation +- [ ] Documentation (including examples) +- [ ] Research and understanding +- [ ] No AI tools were used + +> Regardless of AI use, the human contributor remains fully responsible for correctness, design choices, licensing compatibility, and long-term maintainability. From 01a5fb91917557b597587ccc670be4e1b97d6f77 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Tue, 18 Aug 2026 12:54:26 +0000 Subject: [PATCH 6/6] no coverage for asdf-schemas --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b92d40ae3..98503370d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,6 +64,7 @@ jobs: - macos: py312 - linux: py311-oldestdeps - linux: asdf_schemas + coverage: false docs: needs: [core]