From b0bade8266f5131ed50b1c9cdc8eb02842f9ad06 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 28 Jun 2026 08:23:23 +0000
Subject: [PATCH 1/2] Update from copier (2026-06-28T08:23:23)

Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 .copier-answers.yml          |  2 +-
 .github/workflows/build.yaml | 56 ++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/.copier-answers.yml b/.copier-answers.yml
index c4543ac..d39f6d1 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 99606c7
+_commit: 392c67f
 _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 97eacee..ffc7ace 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -31,6 +31,7 @@ jobs:
           cibuildwheel:
             - "cp311"
     steps:
+<<<<<<< before updating
       - uses: actions/checkout@v6
         with:
           submodules: 'true'
@@ -102,3 +103,58 @@ jobs:
 
       - name: Test Wheel
         run: python -m pytest -vvv verible/tests
+=======
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+
+    - uses: actions-ext/python/setup@main
+      with:
+        version: ${{ matrix.python-version }}
+
+    - 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
+      with:
+        name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
+        path: junit.xml
+      if: ${{ always() }}
+
+    - name: Publish Unit Test Results
+      uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0
+      with:
+        files: '**/junit.xml'
+
+    - name: Upload coverage
+      uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+
+    - name: Make dist
+      run: make dist
+
+    - uses: actions-ext/python/test-wheel@main
+      with:
+        module: verible
+
+    - uses: actions-ext/python/test-sdist@main
+      with:
+        module: verible
+
+    - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+      with:
+        name: dist-${{matrix.os}}
+        path: dist
+>>>>>>> after updating

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

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

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ffc7ace..97eacee 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -31,7 +31,6 @@ jobs:
           cibuildwheel:
             - "cp311"
     steps:
-<<<<<<< before updating
       - uses: actions/checkout@v6
         with:
           submodules: 'true'
@@ -103,58 +102,3 @@ jobs:
 
       - name: Test Wheel
         run: python -m pytest -vvv verible/tests
-=======
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-
-    - uses: actions-ext/python/setup@main
-      with:
-        version: ${{ matrix.python-version }}
-
-    - 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
-      with:
-        name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
-        path: junit.xml
-      if: ${{ always() }}
-
-    - name: Publish Unit Test Results
-      uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0
-      with:
-        files: '**/junit.xml'
-
-    - name: Upload coverage
-      uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-
-    - name: Make dist
-      run: make dist
-
-    - uses: actions-ext/python/test-wheel@main
-      with:
-        module: verible
-
-    - uses: actions-ext/python/test-sdist@main
-      with:
-        module: verible
-
-    - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-      with:
-        name: dist-${{matrix.os}}
-        path: dist
->>>>>>> after updating