From 51b6d046b3cbf5322564fabba9ba3a5bc21d6779 Mon Sep 17 00:00:00 2001 From: "copier-update[bot]" Date: Sat, 1 Aug 2026 22:44:50 +0000 Subject: [PATCH 1/3] Update from Copier (2026-08-01T22-44-47Z) Signed-off-by: copier-update[bot] --- .copier-answers.yaml | 2 +- .github/workflows/build.yaml | 63 +++++++++++++++++++++++++++++++++++ .github/workflows/copier.yaml | 7 ++-- yardang/tests/test_all.py | 4 +++ 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index e0f62b3..cd03afa 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: c2ea129 +_commit: b2cdb6d _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 37b8089..6f3a529 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,6 +33,7 @@ jobs: python-version: ["3.11"] steps: +<<<<<<< before updating - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -106,3 +107,65 @@ jobs: with: name: dist-${{matrix.os}} path: dist +======= + - name: Checkout + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Setup Python + uses: actions-ext/python/setup@6e1b91a408ea89f49bc8aff8724f83826f7b5446 + 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.0.1 + with: + name: test-results-${{ matrix.os }}-${{ matrix.python-version }} + 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@6e1b91a408ea89f49bc8aff8724f83826f7b5446 + with: + module: yardang + + - name: Test source distribution + uses: actions-ext/python/test-sdist@6e1b91a408ea89f49bc8aff8724f83826f7b5446 + with: + module: yardang + + - name: Upload distributions + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: dist-${{matrix.os}} + path: dist +>>>>>>> after updating diff --git a/.github/workflows/copier.yaml b/.github/workflows/copier.yaml index a936d5f..7171411 100644 --- a/.github/workflows/copier.yaml +++ b/.github/workflows/copier.yaml @@ -12,6 +12,7 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions-ext/copier-update@378500315a83b5985e175139a55f1fa5ea6dde09 - with: - token: ${{ secrets.WORKFLOW_TOKEN }} + - name: Update from Copier + uses: actions-ext/copier/update@2061209faa6b75ffd4fcecc0b0983772767997f4 + with: + token: ${{ secrets.WORKFLOW_TOKEN }} diff --git a/yardang/tests/test_all.py b/yardang/tests/test_all.py index ce9a8a0..f8279b1 100644 --- a/yardang/tests/test_all.py +++ b/yardang/tests/test_all.py @@ -1,5 +1,9 @@ +<<<<<<< before updating import os from pathlib import Path +======= +from yardang import * +>>>>>>> after updating import pytest from typer import Exit From 1027499c669f160c19652c8517f0a3faff043566 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sat, 1 Aug 2026 18:48:50 -0400 Subject: [PATCH 2/3] Resolve Copier update conflicts Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com> --- .github/workflows/build.yaml | 93 +++++++----------------------------- yardang/tests/test_all.py | 4 -- 2 files changed, 17 insertions(+), 80 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6f3a529..39714d4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,81 +33,6 @@ jobs: python-version: ["3.11"] steps: -<<<<<<< before updating - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - - name: Setup Python - uses: actions-ext/python/setup@6e1b91a408ea89f49bc8aff8724f83826f7b5446 - with: - version: ${{ matrix.python-version }} - - - name: Setup Node.js - uses: actions-ext/node/setup@0ea5bdcd24d2488b28e16bf611b446a2f8e1e12f - with: - version: '22' - - - name: Setup Rust - uses: actions-ext/rust/setup@c9cdbe5cc8a2485bf2eb22644302559c741ca763 - - - name: Install JSDoc/TypeDoc - run: npm install -g jsdoc typedoc - - - name: Install doxygen - run: sudo apt-get install -y doxygen - - - name: Clean up problematic directories - run: rm -rf docs/jupyter_execute - - - 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-${{ 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@6e1b91a408ea89f49bc8aff8724f83826f7b5446 - with: - module: yardang - - - uses: actions-ext/python/test-sdist@6e1b91a408ea89f49bc8aff8724f83826f7b5446 - with: - module: yardang - - - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 - with: - name: dist-${{matrix.os}} - path: dist -======= - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: @@ -118,6 +43,23 @@ jobs: with: version: ${{ matrix.python-version }} + - name: Setup Node.js + uses: actions-ext/node/setup@0ea5bdcd24d2488b28e16bf611b446a2f8e1e12f + with: + version: "22" + + - name: Setup Rust + uses: actions-ext/rust/setup@c9cdbe5cc8a2485bf2eb22644302559c741ca763 + + - name: Install JSDoc and TypeDoc + run: npm install -g jsdoc typedoc + + - name: Install Doxygen + run: sudo apt-get install -y doxygen + + - name: Clean generated notebooks + run: rm -rf docs/jupyter_execute + - name: Install dependencies run: make develop @@ -168,4 +110,3 @@ jobs: with: name: dist-${{matrix.os}} path: dist ->>>>>>> after updating diff --git a/yardang/tests/test_all.py b/yardang/tests/test_all.py index f8279b1..ce9a8a0 100644 --- a/yardang/tests/test_all.py +++ b/yardang/tests/test_all.py @@ -1,9 +1,5 @@ -<<<<<<< before updating import os from pathlib import Path -======= -from yardang import * ->>>>>>> after updating import pytest from typer import Exit From 9c35005cb3a571fb9a3b2ad62b48273fb2a6050a Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sat, 1 Aug 2026 18:50:15 -0400 Subject: [PATCH 3/3] Fix Yardang Node setup Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com> --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 39714d4..d8f8bdc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -44,9 +44,9 @@ jobs: version: ${{ matrix.python-version }} - name: Setup Node.js - uses: actions-ext/node/setup@0ea5bdcd24d2488b28e16bf611b446a2f8e1e12f + uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.0.0 with: - version: "22" + node-version: "22" - name: Setup Rust uses: actions-ext/rust/setup@c9cdbe5cc8a2485bf2eb22644302559c741ca763