From 68699f37162d3c78552e9643ceb3cfae2e1eaa3a 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:11:22 +0000
Subject: [PATCH 1/2] Update from Copier (2026-09-06T09-11-19Z)

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 | 21 +++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/.copier-answers.yaml b/.copier-answers.yaml
index dc222c2..8a72f45 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 997054d..ffcd72c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,10 +35,16 @@ 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
+>>>>>>> after updating
         with:
           path: "/home/runner/work/openfpgaloader-python/openfpgaloader-python/.ccache"
           key: cache-${{ runner.os }}-
@@ -56,6 +62,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'
@@ -65,6 +72,20 @@ jobs:
   
       - name: Set up MSYS2 (windows)
         uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884  # v2.32.0
+=======
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Build distributions
+        run: make dist
+
+      - name: Test wheel
+        uses: actions-ext/python/test-wheel@ec67f82b3bd863948308a41ecb9e70547cbb19c7
+        with:
+          module: openfpgaloader
+
+      - name: Test source distribution
+        uses: actions-ext/python/test-sdist@ec67f82b3bd863948308a41ecb9e70547cbb19c7
+>>>>>>> after updating
         with:
           msystem: UCRT64
           update: true

From f9b0e18e45a019195c568c428296f018f11cf51a 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 | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ffcd72c..997054d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,16 +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
->>>>>>> after updating
         with:
           path: "/home/runner/work/openfpgaloader-python/openfpgaloader-python/.ccache"
           key: cache-${{ runner.os }}-
@@ -62,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'
@@ -72,20 +65,6 @@ jobs:
   
       - name: Set up MSYS2 (windows)
         uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884  # v2.32.0
-=======
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Build distributions
-        run: make dist
-
-      - name: Test wheel
-        uses: actions-ext/python/test-wheel@ec67f82b3bd863948308a41ecb9e70547cbb19c7
-        with:
-          module: openfpgaloader
-
-      - name: Test source distribution
-        uses: actions-ext/python/test-sdist@ec67f82b3bd863948308a41ecb9e70547cbb19c7
->>>>>>> after updating
         with:
           msystem: UCRT64
           update: true