From 623f0df2d4fde888306709ab0e1e98ef2e0aedc1 Mon Sep 17 00:00:00 2001
From: "python-templates-copier-update[bot]"
 <python-templates-copier-update[bot]@users.noreply.github.com>
Date: Sun, 25 Oct 2026 09:35:51 +0000
Subject: [PATCH 1/2] Update from Copier (2026-10-25T09-35-48Z)

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 | 45 ++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/.copier-answers.yml b/.copier-answers.yml
index 684f1e8..fd543d1 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: '4372075'
+_commit: 2d2a72d
 _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 708b343..777b3b2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,10 +35,48 @@ jobs:
         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@c8228d827a81b9f8c808825328af361c45461ba3
+        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@cf430e030ddbb5b0abf93d22962f4752f3646cd9  # v7.0.2
+        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@303a32d7a59b442fa8d48b6a1cc6825c09c847a5  # v7.1.1
+>>>>>>> after updating
         with:
           path: "/home/runner/work/verible-python/verible-python/.ccache"
           key: cache-${{ runner.os }}-
@@ -56,6 +94,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
         with:
+<<<<<<< before updating
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
@@ -87,6 +126,12 @@ jobs:
   
       - name: Upload Wheel
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
+=======
+          module: verible
+
+      - name: Upload distributions
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9  # v7.0.2
+>>>>>>> after updating
         with:
           name: dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
           path: dist/*.whl

From a60c5bfc6ee8d9d730d5cc7ff2d178e97e366fba Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Sun, 25 Oct 2026 11:41:35 -0400
Subject: [PATCH 2/2] Resolve the copier conflict in the build workflow

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
---
 .github/workflows/build.yaml | 45 ------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 777b3b2..ebd34cc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,48 +35,10 @@ jobs:
         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@c8228d827a81b9f8c808825328af361c45461ba3
-        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@cf430e030ddbb5b0abf93d22962f4752f3646cd9  # v7.0.2
-        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@303a32d7a59b442fa8d48b6a1cc6825c09c847a5  # v7.1.1
->>>>>>> after updating
         with:
           path: "/home/runner/work/verible-python/verible-python/.ccache"
           key: cache-${{ runner.os }}-
@@ -94,7 +56,6 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
         with:
-<<<<<<< before updating
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
           cache-dependency-path: 'pyproject.toml'
@@ -125,13 +86,7 @@ jobs:
         if: ${{ matrix.os == 'windows-2022' }}
   
       - name: Upload Wheel
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
-=======
-          module: verible
-
-      - name: Upload distributions
         uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9  # v7.0.2
->>>>>>> after updating
         with:
           name: dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
           path: dist/*.whl