From 8e075ccf21d969fda062f44c45d51231b371f00c Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 20 Feb 2025 10:06:01 +0000
Subject: [PATCH 1/2] Update cruft with batchpr

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

diff --git a/.cruft.json b/.cruft.json
index 1e2c31fe..44724d4d 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "09c4b023b973d0bbc5704326720f21d3a766bb11",
+  "commit": "e0e2aa7daee8481747690616356a0f3fa33c177b",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -32,7 +32,7 @@
         ".github/workflows/sub_package_update.yml"
       ],
       "_template": "https://github.com/sunpy/package-template",
-      "_commit": "09c4b023b973d0bbc5704326720f21d3a766bb11"
+      "_commit": "e0e2aa7daee8481747690616356a0f3fa33c177b"
     }
   },
   "directory": null
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 61734fe7..88b26617 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,19 @@ on:
   pull_request:
   # Allow manual runs through the web UI
   workflow_dispatch:
+<<<<<<<
+=======
+  schedule:
+    #        ┌───────── minute (0 - 59)
+    #        │ ┌───────── hour (0 - 23)
+    #        │ │ ┌───────── day of the month (1 - 31)
+    #        │ │ │ ┌───────── month (1 - 12 or JAN-DEC)
+    #        │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT)
+    - cron: '0 7 * * 3'  # Every Wed at 07:00 UTC
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+>>>>>>>
   schedule:
     #        ┌───────── minute (0 - 59)
     #        │ ┌───────── hour (0 - 23)
@@ -64,12 +77,25 @@ jobs:
         - windows: py311
         - macos: py310
         - linux: py310-oldestdeps
+<<<<<<<
         - linux: py312-devdeps
+=======
+        - linux: py311-devdeps
+>>>>>>>
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   docs:
     needs: [core]
+<<<<<<<
+=======
+      envs: |
+        - linux: build_docs
+
+  publish:
+    # Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.*
+    # see https://github-actions-workflows.openastronomy.org/en/latest/publish.html#upload-to-pypi
+>>>>>>>
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       default_python: '3.12'

From f555de90e29739799a78fd07fd2defdaee98de04 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Thu, 20 Feb 2025 10:14:42 +0000
Subject: [PATCH 2/2] Update ci.yml

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88b26617..7d494613 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,8 +15,6 @@ on:
   pull_request:
   # Allow manual runs through the web UI
   workflow_dispatch:
-<<<<<<<
-=======
   schedule:
     #        ┌───────── minute (0 - 59)
     #        │ ┌───────── hour (0 - 23)
@@ -25,17 +23,6 @@ on:
     #        │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT)
     - cron: '0 7 * * 3'  # Every Wed at 07:00 UTC
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
->>>>>>>
-  schedule:
-    #        ┌───────── minute (0 - 59)
-    #        │ ┌───────── hour (0 - 23)
-    #        │ │ ┌───────── day of the month (1 - 31)
-    #        │ │ │ ┌───────── month (1 - 12 or JAN-DEC)
-    #        │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT)
-    - cron: '0 7 * * 1'  # Every day at 07:00 UTC
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -77,25 +64,13 @@ jobs:
         - windows: py311
         - macos: py310
         - linux: py310-oldestdeps
-<<<<<<<
-        - linux: py312-devdeps
-=======
-        - linux: py311-devdeps
->>>>>>>
+        - linux: py313-devdeps
+
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   docs:
     needs: [core]
-<<<<<<<
-=======
-      envs: |
-        - linux: build_docs
-
-  publish:
-    # Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.*
-    # see https://github-actions-workflows.openastronomy.org/en/latest/publish.html#upload-to-pypi
->>>>>>>
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       default_python: '3.12'
@@ -111,7 +86,7 @@ jobs:
   online:
     if: "!startsWith(github.event.ref, 'refs/tags/v')"
     needs: [test]
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       default_python: '3.12'
       submodules: false