From a926916aef0d070782fcfccdb2dbbc747da2be34 Mon Sep 17 00:00:00 2001 From: "python-templates-copier-update[bot]" Date: Sun, 20 Sep 2026 09:38:45 +0000 Subject: [PATCH 1/2] Update from Copier (2026-09-20T09-38-41Z) Signed-off-by: python-templates-copier-update[bot] --- .copier-answers.yaml | 2 +- .github/workflows/build.yaml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index 5d59078..b986029 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 552b2de +_commit: 7d58f0e _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 a38bd9c..0fc20d4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,6 +19,7 @@ permissions: jobs: build: +<<<<<<< before updating runs-on: ${{ matrix.os }} strategy: matrix: @@ -30,6 +31,10 @@ jobs: - "3.11" cibuildwheel: - "cp311" +======= + runs-on: ubuntu-24.04 + +>>>>>>> after updating steps: - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -48,12 +53,19 @@ jobs: - name: Setup cache (windows) uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: +<<<<<<< before updating path: "C:/ProgramData/chocolatey/" key: cache-${{ runner.os }}- restore-keys: cache-${{ runner.os }}- if: ${{ runner.os == 'Windows' }} - uses: actions-ext/python/setup@main +======= + files: '**/junit.xml' + + - name: Upload coverage + uses: codecov/codecov-action@0b35c9ecc4f0529d0eb674914510c22f85b196b4 # v7.1.0 +>>>>>>> after updating with: version: ${{ matrix.python-version }} From 24774543868be49ca4c76a7d4f6893a3de9452f2 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 20 Sep 2026 10:23:42 -0400 Subject: [PATCH 2/2] Update build.yaml --- .github/workflows/build.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0fc20d4..a38bd9c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,7 +19,6 @@ permissions: jobs: build: -<<<<<<< before updating runs-on: ${{ matrix.os }} strategy: matrix: @@ -31,10 +30,6 @@ jobs: - "3.11" cibuildwheel: - "cp311" -======= - runs-on: ubuntu-24.04 - ->>>>>>> after updating steps: - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -53,19 +48,12 @@ jobs: - name: Setup cache (windows) uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: -<<<<<<< before updating path: "C:/ProgramData/chocolatey/" key: cache-${{ runner.os }}- restore-keys: cache-${{ runner.os }}- if: ${{ runner.os == 'Windows' }} - uses: actions-ext/python/setup@main -======= - files: '**/junit.xml' - - - name: Upload coverage - uses: codecov/codecov-action@0b35c9ecc4f0529d0eb674914510c22f85b196b4 # v7.1.0 ->>>>>>> after updating with: version: ${{ matrix.python-version }}