Skip to content

Commit b05e225

Browse files
committed
Fix up rustjswasm
1 parent f3ffa74 commit b05e225

40 files changed

+530
-274
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- js
2929
- jupyter
3030
- rust
31-
# - rustjswasm
31+
- rustjswasm
3232
os:
3333
- ubuntu-latest
3434
- macos-latest

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ test-rust:
8888
cd ../python-template-rust && make test
8989

9090
test-rustjswasm:
91-
cd ../python-template-rust && git config --global user.name "github-actions" && git config --global user.email "41898282+github-actions[bot]@users.noreply.github.c@example.com" && git init && git add . && git commit -m "initial commit"
92-
cd ../python-template-rust && make develop
93-
cd ../python-template-rust && git add Cargo.lock && git commit -m "lockfile"
94-
cd ../python-template-rust && make lint
95-
cd ../python-template-rust && make checks
96-
cd ../python-template-rust && make test
91+
cd ../python-template-rustjswasm && git config --global user.name "github-actions" && git config --global user.email "41898282+github-actions[bot]@users.noreply.github.c@example.com" && git init && git add . && git commit -m "initial commit"
92+
cd ../python-template-rustjswasm && make develop
93+
cd ../python-template-rustjswasm && git add Cargo.lock && git commit -m "lockfile"
94+
cd ../python-template-rustjswasm && make lint
95+
cd ../python-template-rustjswasm && make checks
96+
cd ../python-template-rustjswasm && make test
9797

9898

cpp/.gitignore.jinja

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
{{module}}/extension
143145

js/.gitignore.jinja

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
{{module}}/extension
143145

js/pyproject.toml.jinja

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ exclude = [
113113

114114
[tool.hatch.build.targets.wheel]
115115
packages = ["{{module}}"]
116-
exclude = [
117-
"/js"
118-
]
116+
exclude = ["/js"]
119117

120118
[tool.hatch.build.hooks.hatch-js]
121119
path = "js"

jupyter/.gitignore.jinja

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
{{module}}/extension
143145

python/.gitignore.jinja

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
{{module}}/extension
143145

rust/.gitignore.jinja

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
{{module}}/extension
143145

rust/Makefile.jinja

Lines changed: 1 addition & 11 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/lib{{module}}.dylib {{module}}/{{module}}.abi3.so
43-
else
44-
_CP_COMMAND := cp target/debug/lib{{module}}.so {{module}}/{{module}}.abi3.so
45-
endif
46-
4737
#########
4838
# LINTS #
4939
#########

rust/pyproject.toml.jinja

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ ignore = [
9393
[tool.cibuildwheel]
9494
before-build = "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}/{{module}}/tests"
9897
test-requires = ["pytest", "pytest-cov", "pytest-sugar", "pytest-xdist"]
9998

0 commit comments

Comments
 (0)