From 3483bf03c911337cbebea3d47a91c81447d4e11f Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 23 Apr 2026 10:02:35 +0100 Subject: [PATCH 1/2] Update cruft with batchpr --- .cruft.json | 4 ++-- .github/workflows/ci.yml | 2 +- MANIFEST.in | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.cruft.json b/.cruft.json index c829179ac..05d36bf03 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 25d6f24e3..381730369 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -152,7 +152,7 @@ jobs: steps: - uses: Cadair/matrix-notify-action@main # zizmor: ignore[unpinned-uses] with: - workflow_description: "CI Workflow" + 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 140bead61..a5dad3aff 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,17 +1,27 @@ # Exclude specific files # All files which are tracked by git and not explicitly excluded here are included by setuptools_scm exclude .codecov.yaml +<<<<<<< exclude .mailmap exclude .gitignore exclude .pre-commit-config.yaml exclude .readthedocs.yml +======= +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 - # This subpackage is only used in development checkouts # and should not be included in built tarballs prune ndcube/_dev From 17212e49bdd20190276041978e9be4afdf0be3f1 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 23 Apr 2026 09:06:51 +0000 Subject: [PATCH 2/2] Update MANIFEST.in --- MANIFEST.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index a5dad3aff..624b547ff 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,12 +1,8 @@ # Exclude specific files # All files which are tracked by git and not explicitly excluded here are included by setuptools_scm exclude .codecov.yaml -<<<<<<< exclude .mailmap -exclude .gitignore -exclude .pre-commit-config.yaml exclude .readthedocs.yml -======= exclude .coveragerc exclude .cruft.json exclude .gitignore @@ -15,7 +11,6 @@ exclude .pre-commit-config.yaml exclude .readthedocs.yaml exclude .rtd-environment.yml exclude .ruff.toml ->>>>>>> # Prune folders prune .github