From d35be749ae630810bad88b5a81f820032a68084a 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:12 +0000
Subject: [PATCH 1/2] Update from Copier (2026-09-06T09-10-08Z)

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

diff --git a/.copier-answers.yaml b/.copier-answers.yaml
index caefe00..5d59078 100644
--- a/.copier-answers.yaml
+++ b/.copier-answers.yaml
@@ -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 a38bd9c..03a07f6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,10 +35,36 @@ 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@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
+>>>>>>> after updating
         with:
           path: "/home/runner/work/verilator-python/verilator-python/.ccache"
           key: cache-${{ runner.os }}-
@@ -55,6 +81,7 @@ jobs:
   
       - uses: actions-ext/python/setup@main
         with:
+<<<<<<< before updating
           version: ${{ matrix.python-version }}
   
       - name: Install dependencies
@@ -84,6 +111,20 @@ jobs:
   
       - name: Upload Wheel
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+=======
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Build distributions
+        run: make dist
+
+      - name: Test wheel
+        uses: actions-ext/python/test-wheel@ec67f82b3bd863948308a41ecb9e70547cbb19c7
+        with:
+          module: verilator
+
+      - name: Test source distribution
+        uses: actions-ext/python/test-sdist@ec67f82b3bd863948308a41ecb9e70547cbb19c7
+>>>>>>> after updating
         with:
           name: dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
           path: dist/*.whl

From 3b59b891f1d0f8918148a219edbf0bb5cf086f9d 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 | 41 ------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 03a07f6..a38bd9c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,36 +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@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
->>>>>>> after updating
         with:
           path: "/home/runner/work/verilator-python/verilator-python/.ccache"
           key: cache-${{ runner.os }}-
@@ -81,7 +55,6 @@ jobs:
   
       - uses: actions-ext/python/setup@main
         with:
-<<<<<<< before updating
           version: ${{ matrix.python-version }}
   
       - name: Install dependencies
@@ -111,20 +84,6 @@ jobs:
   
       - name: Upload Wheel
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-=======
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Build distributions
-        run: make dist
-
-      - name: Test wheel
-        uses: actions-ext/python/test-wheel@ec67f82b3bd863948308a41ecb9e70547cbb19c7
-        with:
-          module: verilator
-
-      - name: Test source distribution
-        uses: actions-ext/python/test-sdist@ec67f82b3bd863948308a41ecb9e70547cbb19c7
->>>>>>> after updating
         with:
           name: dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
           path: dist/*.whl