From 6b8bd0c5b8ee29fabc7ba216b50140916780a3e5 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 20 Feb 2025 10:05:33 +0000 Subject: [PATCH 1/3] Update cruft with batchpr --- .cruft.json | 4 ++-- .github/workflows/ci.yml | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.cruft.json b/.cruft.json index 08b74f6..a43ccba 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "09c4b023b973d0bbc5704326720f21d3a766bb11", + "commit": "e0e2aa7daee8481747690616356a0f3fa33c177b", "checkout": null, "context": { "cookiecutter": { @@ -32,7 +32,7 @@ ".github/workflows/sub_package_update.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "09c4b023b973d0bbc5704326720f21d3a766bb11" + "_commit": "e0e2aa7daee8481747690616356a0f3fa33c177b" } }, "directory": null diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5efe3e..f89dbcb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,19 @@ on: pull_request: # Allow manual runs through the web UI workflow_dispatch: +<<<<<<< +======= + schedule: + # ┌───────── minute (0 - 59) + # │ ┌───────── hour (0 - 23) + # │ │ ┌───────── day of the month (1 - 31) + # │ │ │ ┌───────── month (1 - 12 or JAN-DEC) + # │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT) + - cron: '0 7 * * 3' # Every Wed at 07:00 UTC + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} +>>>>>>> schedule: # ┌───────── minute (0 - 59) # │ ┌───────── hour (0 - 23) @@ -44,6 +57,13 @@ jobs: toxdeps: tox-pypi-filter envs: | - linux: py313 +<<<<<<< +======= + - windows: py311 + - macos: py310 + - linux: py310-oldestdeps + - linux: py311-devdeps +>>>>>>> secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -90,6 +110,7 @@ jobs: envs: | - linux: build_docs +<<<<<<< cron: if: | ( @@ -110,6 +131,8 @@ jobs: secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} +======= +>>>>>>> publish: # 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 From a4cdf65df24d77731d47b2ea6b43323ec9eff344 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 20 Feb 2025 10:12:12 +0000 Subject: [PATCH 2/3] Update ci.yml --- .github/workflows/ci.yml | 47 +++------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f89dbcb..ebf212d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,6 @@ on: pull_request: # Allow manual runs through the web UI workflow_dispatch: -<<<<<<< -======= schedule: # ┌───────── minute (0 - 59) # │ ┌───────── hour (0 - 23) @@ -25,17 +23,6 @@ on: # │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT) - cron: '0 7 * * 3' # Every Wed at 07:00 UTC -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} ->>>>>>> - schedule: - # ┌───────── minute (0 - 59) - # │ ┌───────── hour (0 - 23) - # │ │ ┌───────── day of the month (1 - 31) - # │ │ │ ┌───────── month (1 - 12 or JAN-DEC) - # │ │ │ │ ┌───────── day of the week (0 - 6 or SUN-SAT) - - cron: '0 7 * * 1' # Every Monday at 07:00 UTC - concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -57,13 +44,7 @@ jobs: toxdeps: tox-pypi-filter envs: | - linux: py313 -<<<<<<< -======= - - windows: py311 - - macos: py310 - - linux: py310-oldestdeps - - linux: py311-devdeps ->>>>>>> + secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -93,6 +74,7 @@ jobs: - linux: py310-oldestdeps - linux: py312 runs-on: ubuntu-24.04-arm + - linux: py313-devdeps secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -110,29 +92,6 @@ jobs: envs: | - linux: build_docs -<<<<<<< - cron: - if: | - ( - github.event_name == 'workflow_dispatch' || - github.event_name == 'schedule' - ) || ( - github.event_name == 'pull_request' && - contains(github.event.pull_request.labels.*.name, 'Run cron CI') - ) - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 - with: - default_python: '3.12' - submodules: false - coverage: codecov - toxdeps: tox-pypi-filter - envs: | - - linux: py311-devdeps - secrets: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - -======= ->>>>>>> publish: # 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 @@ -162,7 +121,7 @@ jobs: notify: if: always() && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') - needs: [publish, cron] + needs: [publish] runs-on: ubuntu-latest steps: - uses: Cadair/matrix-notify-action@main From 34bc6a34dcc5c707707b57192d55fceea740c69c Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 20 Feb 2025 10:12:32 +0000 Subject: [PATCH 3/3] Update .github/workflows/ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebf212d..4938255 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,6 @@ jobs: toxdeps: tox-pypi-filter envs: | - linux: py313 - secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}