From 620fa47207b9597106d875f32af2b67064e81185 Mon Sep 17 00:00:00 2001
From: Cadair <1391051+Cadair@users.noreply.github.com>
Date: Wed, 12 Aug 2026 10:09:42 +0000
Subject: [PATCH 1/5] Run cruft update from package template

---
 .cruft.json              | 8 ++++----
 .github/workflows/ci.yml | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cruft.json b/.cruft.json
index 7e3be99..0935c36 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": "n",
       "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": "!jfEXWJFdXwYnBWsiqk:openastronomy.org",
       "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 cfd8c1d..4194d26 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,8 +79,11 @@ jobs:
         - macos: py312
         - linux: py312-oldestdeps
         - linux: py314-devdeps
+<<<<<<<
         - linux: py313
           runs-on: ubuntu-24.04-arm
+=======
+>>>>>>>
 
   docs:
     needs: [core]

From 50f2cb911e43c4e6aeee87f80094cd4e1e01ca1d Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Wed, 12 Aug 2026 10:40:47 +0000
Subject: [PATCH 2/5] Update ci.yml

---
 .github/workflows/ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4194d26..cfd8c1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,11 +79,8 @@ jobs:
         - macos: py312
         - linux: py312-oldestdeps
         - linux: py314-devdeps
-<<<<<<<
         - linux: py313
           runs-on: ubuntu-24.04-arm
-=======
->>>>>>>
 
   docs:
     needs: [core]

From c22af1d7380938926e0778fbf01fc598338a53de Mon Sep 17 00:00:00 2001
From: SunPyBot <sunpybot@users.noreply.github.com>
Date: Wed, 12 Aug 2026 10:45:54 +0000
Subject: [PATCH 3/5] 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 0935c36..78782d1 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 1953d5d..49f3ad3 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 5ae74d2b31ec18450fa50706a6dadf023034a808 Mon Sep 17 00:00:00 2001
From: SunPyBot <sunpybot@users.noreply.github.com>
Date: Wed, 12 Aug 2026 12:02:40 +0000
Subject: [PATCH 4/5] 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 78782d1..e5315fc 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 dc142a574717e9c2e5a00c218cdde7e3c7f43400 Mon Sep 17 00:00:00 2001
From: SunPyBot <sunpybot@users.noreply.github.com>
Date: Tue, 18 Aug 2026 10:19:44 +0000
Subject: [PATCH 5/5] 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 e5315fc..db1d057 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": "!jfEXWJFdXwYnBWsiqk:openastronomy.org",
       "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
+
+<!--
+Please include a summary of the changes and which issue will be addressed.
+Please also include relevant motivation and context.
+-->
+
+## AI Assistance Disclosure
+
+<!--
+To support transparency and sustainable collaboration, please indicate whether AI-assisted tools were used in preparing this pull request.
+Your pull request will not be reviewed until you have completed this checklist.
+Removing this checklist may result in your pull request being automatically closed without a review.
+For further details see our documentation on the fair and appropriate [usage of AI](https://docs.sunpy.org/en/latest/dev_guide/contents/ai_usage.html).
+-->
+
+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.