From 3caae983198ef57ca2f5ae7d85fa5c791ebf62fe Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Wed, 30 Sep 2026 08:20:56 +0000 Subject: [PATCH 1/4] Run cruft update from package template --- .cruft.json | 4 ++-- .github/workflows/ci.yml | 1 + .github/workflows/label_sync.yml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.cruft.json b/.cruft.json index d482558b..b7146add 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "350cde4a1e8cf83b0944e133bd5797729dae14d1", + "commit": "3201a4eb96727a69ace8bfb4473cef17be06fc0b", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "350cde4a1e8cf83b0944e133bd5797729dae14d1" + "_commit": "3201a4eb96727a69ace8bfb4473cef17be06fc0b" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf5a4703..29ec5703 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,7 @@ permissions: {} jobs: core: + if: ${{ !github.event.repository.fork || github.event_name != 'schedule' }} uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 permissions: id-token: write diff --git a/.github/workflows/label_sync.yml b/.github/workflows/label_sync.yml index cc1d5fbd..27a99bae 100644 --- a/.github/workflows/label_sync.yml +++ b/.github/workflows/label_sync.yml @@ -15,6 +15,7 @@ permissions: jobs: label_sync: + if: ${{ !github.event.repository.fork }} runs-on: ubuntu-latest name: Label Sync steps: From 976bcb1788c4e1914618acd1c15d87d52eb56b85 Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Thu, 1 Oct 2026 09:14:13 +0000 Subject: [PATCH 2/4] Run cruft update from package template --- .cruft.json | 4 ++-- .pre-commit-config.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index b7146add..034e7635 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "3201a4eb96727a69ace8bfb4473cef17be06fc0b", + "commit": "55170fd2032878eb5d446e27f0b1811847cc122f", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "3201a4eb96727a69ace8bfb4473cef17be06fc0b" + "_commit": "55170fd2032878eb5d446e27f0b1811847cc122f" } }, "directory": null diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c4a556ad..c2d09d6b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.16.5" + rev: "v0.16.9" hooks: - id: ruff-check args: ["--fix", "--show-fixes"] From 5e5ce33bd0097e1f19e618baf1e47194f5b3fa6e Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Thu, 8 Oct 2026 07:37:38 +0000 Subject: [PATCH 3/4] Run cruft update from package template --- .cruft.json | 4 ++-- .github/workflows/ci.yml | 13 +++++++++---- .pre-commit-config.yaml | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.cruft.json b/.cruft.json index 034e7635..1153ed31 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "55170fd2032878eb5d446e27f0b1811847cc122f", + "commit": "85c6f46160cd6a98dc6f9b32067c0835f98a9c19", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "55170fd2032878eb5d446e27f0b1811847cc122f" + "_commit": "85c6f46160cd6a98dc6f9b32067c0835f98a9c19" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29ec5703..70fb1497 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ permissions: {} jobs: core: if: ${{ !github.event.repository.fork || github.event_name != 'schedule' }} - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@3a3dcf3ba6828dac29eba10334948ef38364ed14 # v3.1.0 permissions: id-token: write with: @@ -59,7 +59,7 @@ jobs: test: needs: [core, sdist_verify] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@3a3dcf3ba6828dac29eba10334948ef38364ed14 # v3.1.0 permissions: id-token: write with: @@ -76,7 +76,7 @@ jobs: docs: needs: [core] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@3a3dcf3ba6828dac29eba10334948ef38364ed14 # v3.1.0 with: default_python: '3.13' submodules: false @@ -89,9 +89,14 @@ jobs: - linux: build_docs online: +<<<<<<< if: "!startsWith(github.event.ref, 'refs/tags/v')" needs: [test] uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 +======= + needs: [core] + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@3a3dcf3ba6828dac29eba10334948ef38364ed14 # v3.1.0 +>>>>>>> permissions: id-token: write with: @@ -113,7 +118,7 @@ jobs: contains(github.event.pull_request.labels.*.name, 'Run publish') ) needs: [test, docs] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@3a3dcf3ba6828dac29eba10334948ef38364ed14 # v3.1.0 with: python-version: '3.13' test_extras: 'tests' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c2d09d6b..0707cab0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.16.9" + rev: "v0.16.10" hooks: - id: ruff-check args: ["--fix", "--show-fixes"] From 1cbbfe31c1e55dda2e27d59b38136501e1141a63 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 8 Oct 2026 08:53:29 +0000 Subject: [PATCH 4/4] Update ci.yml --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70fb1497..759c2ee2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,14 +89,8 @@ jobs: - linux: build_docs online: -<<<<<<< - if: "!startsWith(github.event.ref, 'refs/tags/v')" - needs: [test] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 -======= needs: [core] uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@3a3dcf3ba6828dac29eba10334948ef38364ed14 # v3.1.0 ->>>>>>> permissions: id-token: write with: