From db0d59ae59ab9c4ab5941f87852d2c542be49798 Mon Sep 17 00:00:00 2001
From: "python-templates-copier-update[bot]"
 <python-templates-copier-update[bot]@users.noreply.github.com>
Date: Sun, 20 Sep 2026 09:39:22 +0000
Subject: [PATCH 1/2] Update from Copier (2026-09-20T09-39-18Z)

Signed-off-by: python-templates-copier-update[bot] <python-templates-copier-update[bot]@users.noreply.github.com>
---
 .copier-answers.yml          |  2 +-
 .github/workflows/build.yaml | 43 ++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/.copier-answers.yml b/.copier-answers.yml
index 3397d8d..1c9ac77 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -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 198b0f7..9b3770b 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,15 +31,57 @@ jobs:
             - "3.11"
           cibuildwheel:
             - "cp311"
+=======
+    runs-on: ubuntu-24.04
+
+>>>>>>> after updating
     steps:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
+<<<<<<< before updating
           submodules: 'true'
   
       - name: Setup cache (mac/linux)
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9  # v6.1.0
+=======
+
+      - name: Setup Python
+        uses: actions-ext/python/setup@ec67f82b3bd863948308a41ecb9e70547cbb19c7
+        with:
+          version: "3.11"
+
+      - name: Install dependencies
+        run: make develop
+
+      - name: Lint
+        run: make lint
+
+      - name: Checks
+        run: make checks
+
+      - name: Build
+        run: make build
+
+      - name: Test
+        run: make coverage
+
+      - name: Upload test results (Python)
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
+        with:
+          name: test-results
+          path: junit.xml
+        if: always()
+
+      - name: Publish test results
+        uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3  # v2.24.0
+        with:
+          files: '**/junit.xml'
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@0b35c9ecc4f0529d0eb674914510c22f85b196b4  # v7.1.0
+>>>>>>> after updating
         with:
           path: "/home/runner/work/verible-python/verible-python/.ccache"
           key: cache-${{ runner.os }}-

From 419a646b052022399fa912ad7620060a67b57a6d Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Sun, 20 Sep 2026 10:20:52 -0400
Subject: [PATCH 2/2] Update build.yaml

---
 .github/workflows/build.yaml | 43 ------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9b3770b..198b0f7 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,57 +30,15 @@ jobs:
             - "3.11"
           cibuildwheel:
             - "cp311"
-=======
-    runs-on: ubuntu-24.04
-
->>>>>>> after updating
     steps:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-<<<<<<< before updating
           submodules: 'true'
   
       - name: Setup cache (mac/linux)
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9  # v6.1.0
-=======
-
-      - name: Setup Python
-        uses: actions-ext/python/setup@ec67f82b3bd863948308a41ecb9e70547cbb19c7
-        with:
-          version: "3.11"
-
-      - name: Install dependencies
-        run: make develop
-
-      - name: Lint
-        run: make lint
-
-      - name: Checks
-        run: make checks
-
-      - name: Build
-        run: make build
-
-      - name: Test
-        run: make coverage
-
-      - name: Upload test results (Python)
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
-        with:
-          name: test-results
-          path: junit.xml
-        if: always()
-
-      - name: Publish test results
-        uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3  # v2.24.0
-        with:
-          files: '**/junit.xml'
-
-      - name: Upload coverage
-        uses: codecov/codecov-action@0b35c9ecc4f0529d0eb674914510c22f85b196b4  # v7.1.0
->>>>>>> after updating
         with:
           path: "/home/runner/work/verible-python/verible-python/.ccache"
           key: cache-${{ runner.os }}-