From 3ada522c154d19b722c23735ef85323feb2ee073 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 14:09:07 +0000 Subject: [PATCH 1/2] Update from copier from copier (2026-06-03T14:09:07) Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .copier-answers.yaml | 2 +- .github/workflows/build.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index a1fd768..c7947c5 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: b5fb449 +_commit: 9b3c202 _src_path: https://github.com/python-project-templates/base.git add_docs: false add_extension: python diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b47a845..89e0fbb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -31,7 +31,13 @@ jobs: cibuildwheel: - "cp311" steps: +<<<<<<< before updating - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 +======= + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + + - uses: actions-ext/python/setup@main +>>>>>>> after updating with: submodules: 'true' From 846a1d4eec23551012053b49199694afe77f2948 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Thu, 4 Jun 2026 11:48:18 -0400 Subject: [PATCH 2/2] resolve conflict --- .github/workflows/build.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 89e0fbb..6dc59cb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -31,13 +31,7 @@ jobs: cibuildwheel: - "cp311" steps: -<<<<<<< before updating - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 -======= - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - - - uses: actions-ext/python/setup@main ->>>>>>> after updating with: submodules: 'true'