From 02cbbed581bc43dd35fab73dcc799aa0eb197301 Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Wed, 12 Aug 2026 10:09:54 +0000 Subject: [PATCH 1/6] Run cruft update from package template --- .cruft.json | 8 ++++---- .github/workflows/ci.yml | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.cruft.json b/.cruft.json index 3811a56..9276029 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "9810f983b63cad4d9abfb6088a40617578a6d965", + "commit": "dce4f87cccac0059526182851a3b3e0b069b7a47", "checkout": null, "context": { "cookiecutter": { @@ -22,6 +22,7 @@ "enable_dynamic_dev_versions": "y", "include_example_code": "n", "include_cruft_update_github_workflow": "n", + "use_pat_in_cruft_update_workflow": "y", "use_extended_ruff_linting": "y", "matrix_room_id": "", "extra_ci_jobs": "", @@ -30,11 +31,10 @@ "_install_requires": "", "_copy_without_render": [ "docs/_templates", - "docs/_static", - ".github/workflows/sub_package_update.yml" + "docs/_static" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "9810f983b63cad4d9abfb6088a40617578a6d965" + "_commit": "dce4f87cccac0059526182851a3b3e0b069b7a47" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4082075..520b139 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,15 +32,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 toxdeps: "tox-pypi-filter" posargs: -n auto +======= + coverage: codecov-oidc + toxdeps: tox-pypi-filter +>>>>>>> envs: | - linux: py313 - secrets: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} sdist_verify: runs-on: ubuntu-latest @@ -59,10 +64,17 @@ 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 toxdeps: "tox-pypi-filter" +======= + coverage: codecov-oidc + toxdeps: tox-pypi-filter +>>>>>>> posargs: -n auto envs: | - linux: py314 @@ -70,8 +82,6 @@ jobs: - macos: py312 - linux: py312-oldestdeps - linux: py314-devdeps - secrets: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} docs: needs: [core] From c2433ff728695bdb81ec4e2cf8c01964da089bf8 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 12 Aug 2026 10:37:24 +0000 Subject: [PATCH 2/6] Update ci.yml --- .github/workflows/ci.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 520b139..93b07c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,14 +36,9 @@ jobs: id-token: write with: submodules: false -<<<<<<< - coverage: codecov - toxdeps: "tox-pypi-filter" - posargs: -n auto -======= coverage: codecov-oidc toxdeps: tox-pypi-filter ->>>>>>> + posargs: -n auto envs: | - linux: py313 @@ -68,13 +63,8 @@ jobs: id-token: write with: submodules: false -<<<<<<< - coverage: codecov - toxdeps: "tox-pypi-filter" -======= coverage: codecov-oidc toxdeps: tox-pypi-filter ->>>>>>> posargs: -n auto envs: | - linux: py314 From 2b9d1555181d89432f5066f66196e72b04ebe179 Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Wed, 12 Aug 2026 10:45:52 +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, 32 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/zizmor.yml diff --git a/.cruft.json b/.cruft.json index 9276029..9f0b0b1 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 0000000..b7eced8 --- /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 b51f405..b4dea87 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,9 +1,13 @@ 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 +======= + # This should be before any formatting hooks like isort +>>>>>>> - repo: https://github.com/astral-sh/ruff-pre-commit rev: "v0.16.1" hooks: From 9bfe786893b73a80bb0200df051cf1125d796503 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 12 Aug 2026 10:47:29 +0000 Subject: [PATCH 4/6] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4dea87..915a02b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,13 +1,5 @@ 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 -======= # This should be before any formatting hooks like isort ->>>>>>> - repo: https://github.com/astral-sh/ruff-pre-commit rev: "v0.16.1" hooks: From 26203912923e65e18bdc91c5598284ac84658050 Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Wed, 12 Aug 2026 12:02:45 +0000 Subject: [PATCH 5/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 9f0b0b1..a0c5280 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 b7eced8..777801f 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 677d9558c1617e7778f36289edbed581711f2f3a Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Tue, 18 Aug 2026 10:19:42 +0000 Subject: [PATCH 6/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 a0c5280..4821488 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": "", "extra_ci_jobs": "", + "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 0000000..79183a1 --- /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.