Skip to content

Commit 6097b0f

Browse files
authored
Merge pull request #60 from python-project-templates/copier-update-2025-08-11T17-45-48
Update from copier (2025-08-11T17:45:48)
2 parents fc674c0 + 139b8e5 commit 6097b0f

File tree

8 files changed

+19
-28
lines changed

8 files changed

+19
-28
lines changed

.copier-answers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: f3ffa74
2+
_commit: fa27c8d
33
_src_path: https://github.com/python-project-templates/base.git
44
add_docs: true
55
add_extension: rust

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
python-version: ["3.9"]
3434

3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v5
3737

3838
- uses: actions-ext/python/setup@main
3939
with:

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
docs:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- uses: actions-ext/python/setup@main
1616
- uses: actions-ext/rust/setup@main
17-
- run: uv pip install .
17+
- run: uv pip install .[develop]
1818
- run: uv pip install yardang
1919
- run: yardang build
2020
- uses: peaceiris/actions-gh-pages@v4

.github/workflows/wiki.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
deploy:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- run: cp README.md docs/wiki/Home.md
2525
- uses: Andrew-Chen-Wang/github-wiki-action@v5
2626
with:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ js/coverage
138138
js/dist
139139
js/lib
140140
js/node_modules
141+
js/test-results
142+
js/playwright-report
141143
js/*.tgz
142144
python_template_rust/extension
143145

Makefile

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,19 @@ requirements-rs: ## install prerequisite rust build requirements
2121

2222
requirements: requirements-rs requirements-py ## setup project for development
2323

24-
.PHONY: build-py build-rs build dev
24+
.PHONY: build-py build-rs build
2525
build-py:
2626
python -m build -w -n
2727

2828
build-rs:
2929
make -C rust build
3030

31-
dev: build ## lightweight in-place build for iterative dev
32-
$(_CP_COMMAND)
33-
3431
build: build-rs build-py ## build the project
3532

3633
.PHONY: install
3734
install: ## install python library
3835
uv pip install .
3936

40-
UNAME := $(shell uname)
41-
ifeq ($(UNAME), Darwin)
42-
_CP_COMMAND := cp target/debug/libpython_template_rust.dylib python_template_rust/python_template_rust.abi3.so
43-
else
44-
_CP_COMMAND := cp target/debug/libpython_template_rust.so python_template_rust/python_template_rust.abi3.so
45-
endif
46-
4737
#########
4838
# LINTS #
4939
#########
@@ -146,21 +136,21 @@ major: ## bump a major version
146136
########
147137
.PHONY: dist-py-wheel dist-py-sdist dist-rs dist-check dist publish
148138

149-
dist-py-wheel: # build python wheel
139+
dist-py-wheel: ## build python wheel
150140
python -m cibuildwheel --output-dir dist
151141

152-
dist-py-sdist: # build python sdist
142+
dist-py-sdist: ## build python sdist
153143
python -m build --sdist -o dist
154144

155-
dist-rs: # build rust dists
145+
dist-rs: ## build rust dists
156146
make -C rust dist
157147

158148
dist-check: ## run python dist checker with twine
159149
python -m twine check dist/*
160150

161151
dist: clean build dist-rs dist-py-wheel dist-py-sdist dist-check ## build all dists
162152

163-
publish: dist # publish python assets
153+
publish: dist ## publish python assets
164154

165155
#########
166156
# CLEAN #

pyproject.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,23 @@ ignore = [
9191
]
9292

9393
[tool.cibuildwheel]
94-
before-build = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y"
94+
before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y"
9595
build = "cp39-*"
96-
skip = "*musllinux*"
9796
test-command = "pytest -vvv {project}/python_template_rust/tests"
9897
test-requires = ["pytest", "pytest-cov", "pytest-sugar", "pytest-xdist"]
9998

10099
[tool.cibuildwheel.linux]
101-
before-build = """
100+
before-all = """
102101
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y
103102
rustup target add aarch64-unknown-linux-gnu
104103
rustup target add x86_64-unknown-linux-gnu
105104
rustup show
106105
"""
107106
environment = {PATH="$HOME/.cargo/bin:$PATH", CARGO_TERM_COLOR="always"}
108-
skip = "*i686 musllinux*"
107+
skip = "*i686* *musllinux*"
109108

110109
[tool.cibuildwheel.macos]
111-
before-build = """
110+
before-all = """
112111
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y
113112
rustup target add aarch64-apple-darwin
114113
rustup target add x86_64-apple-darwin
@@ -118,7 +117,7 @@ environment = {PATH="$HOME/.cargo/bin:$PATH", CARGO_TERM_COLOR="always", MACOS_D
118117
archs = "arm64"
119118

120119
[tool.cibuildwheel.windows]
121-
before-build = """
120+
before-all = """
122121
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y
123122
rustup target add x86_64-pc-windows-msvc
124123
rustup target add aarch64-pc-windows-msvc

rust/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
requirements: ## install required dev dependencies
44
rustup component add rustfmt
55
rustup component add clippy
6-
cargo install cargo-nextest
7-
cargo install cargo-llvm-cov
6+
cargo install cargo-nextest --force
7+
cargo install cargo-llvm-cov --force
88

99
develop: requirements ## install required dev dependencies
1010

0 commit comments

Comments
 (0)