From f1ecbe5899852f31ac2c05a7499e6e6385caaf13 Mon Sep 17 00:00:00 2001
From: "python-templates-copier-update[bot]"
 <python-templates-copier-update[bot]@users.noreply.github.com>
Date: Sun, 6 Sep 2026 09:10:47 +0000
Subject: [PATCH 1/2] Update from Copier (2026-09-06T09-10-43Z)

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

diff --git a/.copier-answers.yml b/.copier-answers.yml
index 6c3cc7c..3397d8d 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 2f83523
+_commit: 552b2de
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: false
 add_extension: python
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 0961ae8..8fb3966 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -4,6 +4,10 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
     labels:
       - "part: github_actions"
 
@@ -13,6 +17,10 @@ updates:
       interval: "monthly"
     cooldown:
       default-days: 7
+    groups:
+      python:
+        patterns:
+          - "*"
     labels:
       - "lang: python"
       - "part: dependencies"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 198b0f7..e6c6ef2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,6 +35,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
+<<<<<<< before updating
           submodules: 'true'
   
       - name: Setup cache (mac/linux)
@@ -55,6 +56,56 @@ jobs:
   
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.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@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v7.0.0
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Build distributions
+        run: make dist
+
+      - name: Test wheel
+        uses: actions-ext/python/test-wheel@ec67f82b3bd863948308a41ecb9e70547cbb19c7
+        with:
+          module: verible
+
+      - name: Test source distribution
+        uses: actions-ext/python/test-sdist@ec67f82b3bd863948308a41ecb9e70547cbb19c7
+>>>>>>> after updating
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'

From 6b130f386122cbe69720625deebb8333a6fd6afc Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Sun, 6 Sep 2026 17:36:44 -0400
Subject: [PATCH 2/2] Keep the native build workflow through the Copier update

The template renders an ubuntu-only pure-Python build.yaml, so Copier
splices it into this repo's cross-platform cibuildwheel workflow and
leaves conflict markers. The markers make the file invalid YAML, so
Actions refuses to run it and the pull request reports no checks.

Resolve build.yaml back to the workflow this repo owns. The rest of the
update -- the dependabot grouping, the gitignore entries and the uv-based
requirements target -- applies cleanly and is kept.

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

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e6c6ef2..198b0f7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,7 +35,6 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-<<<<<<< before updating
           submodules: 'true'
   
       - name: Setup cache (mac/linux)
@@ -56,56 +55,6 @@ jobs:
   
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.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@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v7.0.0
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Build distributions
-        run: make dist
-
-      - name: Test wheel
-        uses: actions-ext/python/test-wheel@ec67f82b3bd863948308a41ecb9e70547cbb19c7
-        with:
-          module: verible
-
-      - name: Test source distribution
-        uses: actions-ext/python/test-sdist@ec67f82b3bd863948308a41ecb9e70547cbb19c7
->>>>>>> after updating
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'