From 85cd9e585ed1b5b76732408d4e932b960812ab17 Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Wed, 21 Oct 2026 14:17:36 +0000 Subject: [PATCH 1/6] Run cruft update from package template --- .cruft.json | 4 ++-- .github/workflows/ci.yml | 10 +++++++--- .github/workflows/zizmor.yml | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cruft.json b/.cruft.json index d43a14c..046abf8 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "1d66e77dcb4eb585d51e969e9fadc3c1660f33f5", + "commit": "07598e4e7ed228c3dc25cf87f07c3decc2a91c15", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "1d66e77dcb4eb585d51e969e9fadc3c1660f33f5" + "_commit": "07598e4e7ed228c3dc25cf87f07c3decc2a91c15" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f38d2f5..c64f76e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: core: if: ${{ !github.event.repository.fork || github.event_name != 'schedule' }} - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c9f6c4af6750aa4b26765e8c312164efc226dfd # v3.2.0 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8d5ad7efc8e84a051639373f6ea0d10441eafee1 # v3.2.1 permissions: id-token: write with: @@ -67,7 +67,7 @@ jobs: test: needs: [core, sdist_verify] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c9f6c4af6750aa4b26765e8c312164efc226dfd # v3.2.0 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8d5ad7efc8e84a051639373f6ea0d10441eafee1 # v3.2.1 permissions: id-token: write with: @@ -85,7 +85,7 @@ jobs: docs: needs: [core] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c9f6c4af6750aa4b26765e8c312164efc226dfd # v3.2.0 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8d5ad7efc8e84a051639373f6ea0d10441eafee1 # v3.2.1 with: default_python: '3.13' submodules: false @@ -107,7 +107,11 @@ jobs: contains(github.event.pull_request.labels.*.name, 'Run publish') ) needs: [test, docs] +<<<<<<< uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@8c9f6c4af6750aa4b26765e8c312164efc226dfd # v3.2.0 +======= + uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@8d5ad7efc8e84a051639373f6ea0d10441eafee1 # v3.2.1 +>>>>>>> with: sdist: true test_extras: 'tests' diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index efdf8c8..3f744a3 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -25,4 +25,4 @@ jobs: persist-credentials: false - name: Run zizmor 🌈 - uses: zizmorcore/zizmor-action@cc914d7f3750a2d13d75c7f184a1060aa0e9d482 # v0.6.4 + uses: zizmorcore/zizmor-action@85b2b9fb8e3325e7a23d7d0a9d7ba5ae0f999e3e # v0.7.1 From 3a568ab5236ab4c3ab9d6fc836f17c51c9ea7d38 Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Tue, 27 Oct 2026 16:16:12 +0000 Subject: [PATCH 2/6] 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 046abf8..ec0ffa6 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "07598e4e7ed228c3dc25cf87f07c3decc2a91c15", + "commit": "d0024de21727d3ad103d5c83848392fec86ead1a", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "07598e4e7ed228c3dc25cf87f07c3decc2a91c15" + "_commit": "d0024de21727d3ad103d5c83848392fec86ead1a" } }, "directory": null diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2c084df..52f9780 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.17.1" + rev: "v0.17.3" hooks: - id: ruff-check args: ["--fix", "--show-fixes"] From 9a18ae8efc43e8493fcc6b59155f5d8950a9a749 Mon Sep 17 00:00:00 2001 From: SunPyBot Date: Wed, 28 Oct 2026 09:27:37 +0000 Subject: [PATCH 3/6] Run cruft update from package template --- .cruft.json | 4 ++-- .github/workflows/ci.yml | 15 +++++++++++---- .github/workflows/zizmor.yml | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.cruft.json b/.cruft.json index ec0ffa6..7b54894 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "d0024de21727d3ad103d5c83848392fec86ead1a", + "commit": "983c9114fb6ae1d4aab1b93356658b3669795cc6", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "d0024de21727d3ad103d5c83848392fec86ead1a" + "_commit": "983c9114fb6ae1d4aab1b93356658b3669795cc6" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c64f76e..ad37132 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: core: if: ${{ !github.event.repository.fork || github.event_name != 'schedule' }} - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8d5ad7efc8e84a051639373f6ea0d10441eafee1 # v3.2.1 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@1285b95e32c783cfa40eb2ffbd6ca4cd023fb884 # v3.2.2 permissions: id-token: write with: @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false - - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 + - uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0 with: python-version: '3.13' - run: python -m pip install -U --user build twine "validate-pyproject[all]" @@ -67,7 +67,7 @@ jobs: test: needs: [core, sdist_verify] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8d5ad7efc8e84a051639373f6ea0d10441eafee1 # v3.2.1 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@1285b95e32c783cfa40eb2ffbd6ca4cd023fb884 # v3.2.2 permissions: id-token: write with: @@ -85,7 +85,7 @@ jobs: docs: needs: [core] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8d5ad7efc8e84a051639373f6ea0d10441eafee1 # v3.2.1 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@1285b95e32c783cfa40eb2ffbd6ca4cd023fb884 # v3.2.2 with: default_python: '3.13' submodules: false @@ -107,6 +107,13 @@ jobs: contains(github.event.pull_request.labels.*.name, 'Run publish') ) needs: [test, docs] +<<<<<<< +======= + uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@1285b95e32c783cfa40eb2ffbd6ca4cd023fb884 # v3.2.2 + with: + python-version: '3.13' + test_extras: 'tests' +>>>>>>> <<<<<<< uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@8c9f6c4af6750aa4b26765e8c312164efc226dfd # v3.2.0 ======= diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index 3f744a3..2140b1c 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -25,4 +25,4 @@ jobs: persist-credentials: false - name: Run zizmor 🌈 - uses: zizmorcore/zizmor-action@85b2b9fb8e3325e7a23d7d0a9d7ba5ae0f999e3e # v0.7.1 + uses: zizmorcore/zizmor-action@53290badfa369cb0bf7ad16342cb62c2fa47ac7b # v0.8.0 From fe1e05a2abcb5e1515ae44c55fc4ed6a2704b072 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 28 Oct 2026 10:44:41 +0000 Subject: [PATCH 4/6] Fix conflicts & add 3.15 --- .github/workflows/ci.yml | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad37132..ce94273 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: coverage: codecov-oidc toxdeps: tox-pypi-filter envs: | - - linux: py313 + - linux: py314 sdist_verify: runs-on: ubuntu-latest @@ -75,7 +75,8 @@ jobs: coverage: codecov-oidc toxdeps: tox-pypi-filter envs: | - - linux: py314 + - linux: py315 + - linux: py313 - windows: py312 - macos: py312 - linux: py312-oldestdeps @@ -107,29 +108,18 @@ jobs: contains(github.event.pull_request.labels.*.name, 'Run publish') ) needs: [test, docs] -<<<<<<< -======= - uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@1285b95e32c783cfa40eb2ffbd6ca4cd023fb884 # v3.2.2 - with: - python-version: '3.13' - test_extras: 'tests' ->>>>>>> -<<<<<<< - uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@8c9f6c4af6750aa4b26765e8c312164efc226dfd # v3.2.0 -======= - uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@8d5ad7efc8e84a051639373f6ea0d10441eafee1 # v3.2.1 ->>>>>>> + uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@1285b95e32c783cfa40eb2ffbd6ca4cd023fb884 # v3.2.2 with: sdist: true test_extras: 'tests' test_command: 'pytest -p no:warnings --doctest-rst --pyargs streamtracer' targets: | - - cp3{12,13,14}-manylinux_x86_64 - - cp3{12,13,14}-musllinux_x86_64 - - cp3{12,13,14}-macosx_x86_64 - - cp3{12,13,14}-macosx_arm64 - - cp3{12,13,14}-win_amd64 - - target: cp3{12,13,14}-manylinux_aarch64 + - cp3{12,13,14,15}-manylinux_x86_64 + - cp3{12,13,14,15}-musllinux_x86_64 + - cp3{12,13,14,15}-macosx_x86_64 + - cp3{12,13,14,15}-macosx_arm64 + - cp3{12,13,14,15}-win_amd64 + - target: cp3{12,13,14,15}-manylinux_aarch64 runs-on: ubuntu-24.04-arm submodules: false save_artifacts: true From c816afbce7620451de354d14160282b7ac20cb37 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 28 Oct 2026 10:49:14 +0000 Subject: [PATCH 5/6] Update pytest.ini --- pytest.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pytest.ini b/pytest.ini index df5c5ab..79d9f97 100644 --- a/pytest.ini +++ b/pytest.ini @@ -31,3 +31,5 @@ filterwarnings = # A list of warnings to ignore follows. If you add to this list, you MUST # add a comment or ideally a link to an issue that explains why the warning # is being ignored + # oldestdeps + ignore:'setParseAction' deprecated - use 'set_parse_action' From 67c7fe258fb60b74684a1a10df8bebcb2e5b27d8 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 28 Oct 2026 11:14:25 +0000 Subject: [PATCH 6/6] Update packaging dependency version to 23 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c93dd4d..afe8732 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ classifiers = [ version = "2.6.0" dependencies = [ "numpy>=1.26", - "packaging>=21.3", + "packaging>=23", ] [project.optional-dependencies]