From b4ea3ebf0814b611401e3bbb94dfa00e70b6337b Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 23 Apr 2026 10:02:54 +0100
Subject: [PATCH 1/3] Update cruft with batchpr

---
 .cruft.json              |  4 ++--
 .github/workflows/ci.yml |  4 ++++
 MANIFEST.in              | 18 ++++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.cruft.json b/.cruft.json
index bbb41d7..f5f5398 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "3d0ff5cac98c56196dbd1ba3e89703c2b7616e29",
+  "commit": "4c4701e4fe00e17a18e36e189b2928cd69983264",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -33,7 +33,7 @@
         ".github/workflows/sub_package_update.yml"
       ],
       "_template": "https://github.com/sunpy/package-template",
-      "_commit": "3d0ff5cac98c56196dbd1ba3e89703c2b7616e29"
+      "_commit": "4c4701e4fe00e17a18e36e189b2928cd69983264"
     }
   },
   "directory": null
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a7331c..b6eca25 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -155,7 +155,11 @@ jobs:
     steps:
       - uses: Cadair/matrix-notify-action@main  # zizmor: ignore[unpinned-uses]
         with:
+<<<<<<<
           workflow_description: "CI Workflow in sunpy/streamtracer"
+=======
+          workflow_description: 'CI Workflow'
+>>>>>>>
           matrix_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           homeserver: ${{ secrets.MATRIX_HOMESERVER }}
diff --git a/MANIFEST.in b/MANIFEST.in
index f6f79fb..fffdc09 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,20 @@
 # Exclude specific files
+<<<<<<<
+=======
+# All files which are tracked by git and not explicitly excluded here are included by setuptools_scm
+exclude .codecov.yaml
+exclude .coveragerc
+exclude .cruft.json
+exclude .gitignore
+exclude .isort.cfg
+exclude .pre-commit-config.yaml
+exclude .readthedocs.yaml
+exclude .rtd-environment.yml
+exclude .ruff.toml
+
+>>>>>>>
 # Prune folders
+prune .github
 prune build
-prune docs/_build
-prune docs/api
+prune changelog
 global-exclude *.pyc *.o

From ceafa7447b0b55c25331a7f2e6e681e7d9dfdf9b Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 23 Apr 2026 09:08:12 +0000
Subject: [PATCH 2/3] Update ci.yml

---
 .github/workflows/ci.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b6eca25..02f0fd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -155,11 +155,7 @@ jobs:
     steps:
       - uses: Cadair/matrix-notify-action@main  # zizmor: ignore[unpinned-uses]
         with:
-<<<<<<<
-          workflow_description: "CI Workflow in sunpy/streamtracer"
-=======
-          workflow_description: 'CI Workflow'
->>>>>>>
+          workflow_description: 'CI Workflow in sunpy/streamtracer'
           matrix_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           homeserver: ${{ secrets.MATRIX_HOMESERVER }}

From 3cc71c764383c540409aa07e5b0bbfcde64d8599 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 23 Apr 2026 09:08:32 +0000
Subject: [PATCH 3/3] Update MANIFEST.in

---
 MANIFEST.in | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index fffdc09..ba9dcc2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,4 @@
 # Exclude specific files
-<<<<<<<
-=======
 # All files which are tracked by git and not explicitly excluded here are included by setuptools_scm
 exclude .codecov.yaml
 exclude .coveragerc
@@ -12,7 +10,6 @@ exclude .readthedocs.yaml
 exclude .rtd-environment.yml
 exclude .ruff.toml
 
->>>>>>>
 # Prune folders
 prune .github
 prune build