From 241b6e63768572f1ca9fa168488127fdacd96ba7 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Apr 2026 23:46:16 +0000 Subject: [PATCH 1/2] Update from copier (2026-04-02T23:46:16) Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .copier-answers.yaml | 2 +- .github/workflows/build.yaml | 34 ++++++++++++++++++++++++++++++++++ Makefile | 14 +++++++------- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index 3a2a013..68d63b1 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 34c631c +_commit: fead162 _src_path: https://github.com/python-project-templates/base.git add_docs: true add_extension: cpp diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c10c32c..007f0ab 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -84,6 +84,7 @@ jobs: run: make checks if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' +<<<<<<< before updating - name: Install build dependencies run: pip install cibuildwheel @@ -111,6 +112,8 @@ jobs: CIBW_BEFORE_ALL: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" if: matrix.os == 'windows-latest' +======= +>>>>>>> after updating - name: Test run: make coverage @@ -132,6 +135,37 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} + - name: Install build dependencies + run: pip install cibuildwheel + + - name: Make dist (Linux) + run: | + make dist-py-sdist + make dist-py-wheel + make dist-check + env: + CIBW_BUILD: "${{ matrix.cibuildwheel }}-manylinux*" + CIBW_BUILD_VERBOSITY: 3 + if: matrix.os == 'ubuntu-latest' + + - name: Make dist (Macos) + run: | + make dist-py-wheel + env: + CIBW_BUILD: "${{ matrix.cibuildwheel }}-macos*" + CIBW_BUILD_VERBOSITY: 3 + if: matrix.os == 'macos-latest' + + - name: Make dist (Windows) + run: | + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + make dist-py-wheel + shell: cmd + env: + CIBW_BUILD: "${{ matrix.cibuildwheel }}-win_amd64" + CIBW_BEFORE_ALL: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + if: matrix.os == 'windows-latest' + - uses: actions/upload-artifact@v7 with: name: dist-${{matrix.os}}-${{matrix.python-version}} diff --git a/Makefile b/Makefile index 563e3f7..dea2748 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,6 @@ build-py: build-cpp: python -m hatchling build --hooks-only -build-cibw: - python -m cibuildwheel --output-dir dist - build: build-cpp build-py ## build the project .PHONY: install @@ -114,15 +111,18 @@ major: ## bump a major version ######## # DIST # ######## -.PHONY: dist dist-py dist-check publish +.PHONY: dist-py-wheel dist-py-sdist dist-check dist publish + +dist-py-wheel: ## build python wheel + python -m cibuildwheel --output-dir dist -dist-py: ## build python dists - python -m build -w -s +dist-py-sdist: ## build python sdist + python -m build --sdist -o dist dist-check: ## run python dist checker with twine python -m twine check dist/* -dist: clean build dist-js dist-py dist-check ## build all dists +dist: clean build dist-py-wheel dist-py-sdist dist-check ## build all dists publish: dist ## publish python assets From c0792ce3eb7763907d473e969e427c1a62519c7d Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Thu, 2 Apr 2026 19:49:03 -0400 Subject: [PATCH 2/2] Update build.yaml --- .github/workflows/build.yaml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 007f0ab..b776cff 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -84,36 +84,6 @@ jobs: run: make checks if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' -<<<<<<< before updating - - name: Install build dependencies - run: pip install cibuildwheel - - - name: Build (Linux) - run: make build-cibw - env: - CIBW_BUILD: "${{ matrix.cibuildwheel }}-manylinux*" - CIBW_BUILD_VERBOSITY: 3 - if: matrix.os == 'ubuntu-latest' - - - name: Build (Macos) - run: make build-cibw - env: - CIBW_BUILD: "${{ matrix.cibuildwheel }}-macos*" - CIBW_BUILD_VERBOSITY: 3 - if: matrix.os == 'macos-latest' - - - name: Build (Windows) - run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - make build-cibw - shell: cmd - env: - CIBW_BUILD: "${{ matrix.cibuildwheel }}-win_amd64" - CIBW_BEFORE_ALL: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - if: matrix.os == 'windows-latest' - -======= ->>>>>>> after updating - name: Test run: make coverage