diff --git a/.cruft.json b/.cruft.json index c5adb0a..d4474fa 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "632ed04aee0058dd88dc6b7972ca8f8061fbd6da", + "commit": "eac98c6944b91738baaa38320020af8a3ee2a4a4", "checkout": null, "context": { "cookiecutter": { @@ -36,7 +36,7 @@ ".github/workflows/zizmor.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "632ed04aee0058dd88dc6b7972ca8f8061fbd6da" + "_commit": "eac98c6944b91738baaa38320020af8a3ee2a4a4" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfd8c1d..7068595 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: - run: cargo test core: - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 permissions: id-token: write with: @@ -66,7 +66,7 @@ jobs: test: needs: [core, sdist_verify] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 permissions: id-token: write with: @@ -84,7 +84,7 @@ jobs: docs: needs: [core] - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2 + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 with: default_python: '3.13' submodules: false @@ -106,7 +106,11 @@ jobs: contains(github.event.pull_request.labels.*.name, 'Run publish') ) needs: [test, docs] +<<<<<<< uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@8c8bb6c6c962542921f993d47d26df38dccd50b1 # v3.0.2 +======= + uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@22ddf09dfabb443adddfb9f861b7d41a787d6b1a # v3.0.3 +>>>>>>> with: sdist: true test_extras: 'tests' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dd1a746..e003d1d 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.1" + rev: "v0.16.5" hooks: - id: ruff-check args: ["--fix"] diff --git a/.ruff.toml b/.ruff.toml index 2342fe5..6c28d5c 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -1,4 +1,4 @@ -target-version = "py310" +target-version = "py312" line-length = 120 exclude = [ ".git,", diff --git a/pr_body.md b/pr_body.md new file mode 100644 index 0000000..b8de155 --- /dev/null +++ b/pr_body.md @@ -0,0 +1,14 @@ +This is an autogenerated PR, which applies the latest changes from the [SunPy Package Template](https://github.com/sunpy/package-template). + +If this pull request has been opened as a draft there are conflicts which need fixing. + + +## Changes from the template + +- [b516beb](https://github.com/sunpy/package-template/commit/b516beb8592aa098f077a9c429de238679468d92) Only open an issue on sub_package_update if it's cron triggered (#315) +- [b7bc2cc](https://github.com/sunpy/package-template/commit/b7bc2ccfdeab3ec44fb23dbf4f5129de371c5d97) Add the template commit log to the PR description in updater workflow (#314) +- [63f96aa](https://github.com/sunpy/package-template/commit/63f96aa72bb2d32a32af91c700d0f46bae89d87b) Only PR to sunpy repos on schedule or manual run (#318) +- [c1bfa2f](https://github.com/sunpy/package-template/commit/c1bfa2fd8d64c09fffa8c5135424a8127929f966) pre-commit updates in the template (#317) +- [1016d95](https://github.com/sunpy/package-template/commit/1016d9543faddb55bcdda1af345869fda3173b2a) Update GitHub Actions versions (#316) +- [9974ff0](https://github.com/sunpy/package-template/commit/9974ff0044cea04934955150020fbaaf137b3de2) Convert existing PRs to draft if subsequent run adds conflict (#319) +- [eac98c6](https://github.com/sunpy/package-template/commit/eac98c6944b91738baaa38320020af8a3ee2a4a4) More python version templating (#320)