From 9719e2a07f11122df1ee5d2b37d7e67fe9b33579 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 11 Sep 2024 10:51:18 +0100 Subject: [PATCH 1/2] Update cruft with batchpr --- .cruft.json | 2 +- .github/workflows/ci.yml | 4 ++++ .github/workflows/sub_package_update.yml | 2 +- .pre-commit-config.yaml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index d93c4a9..39f7910 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "67ea3b3815de57668e92dbe1fa2c3d033758d8f0", + "commit": "c0e51ac3283d88346534da0aac441f37f624b283", "checkout": null, "context": { "cookiecutter": { diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee5b401..6e5c31e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,10 @@ jobs: - linux: build_docs publish: +<<<<<<< needs: [sdist_verify, docs] +======= +>>>>>>> # 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 if: | @@ -68,6 +71,7 @@ jobs: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Run publish') ) + needs: [test, docs] uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main with: python-version: '3.12' diff --git a/.github/workflows/sub_package_update.yml b/.github/workflows/sub_package_update.yml index 0677948..7455847 100644 --- a/.github/workflows/sub_package_update.yml +++ b/.github/workflows/sub_package_update.yml @@ -65,7 +65,7 @@ jobs: - name: Create pull request if: steps.check.outputs.has_changes == '1' - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GITHUB_TOKEN }} add-paths: ${{ matrix.add-paths }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ec6f76c..3fe0a11 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ exclude: ".*(.csv|.fits|.fts|.fit|.header|.txt|tca.*|.json|.asdf)$|^CITATION.rst repos: # This should be before any formatting hooks like isort - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.6.3" + rev: "v0.6.4" hooks: - id: ruff args: ["--fix"] From 9abb8215433c052ccde330bd5d4530b6c084f4cd Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Wed, 11 Sep 2024 10:55:35 +0100 Subject: [PATCH 2/2] Update ci.yml --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e5c31e..74058fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,10 +59,6 @@ jobs: - linux: build_docs publish: -<<<<<<< - needs: [sdist_verify, docs] -======= ->>>>>>> # 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 if: | @@ -71,7 +67,7 @@ jobs: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Run publish') ) - needs: [test, docs] + needs: [sdist_verify, docs] uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main with: python-version: '3.12'