Skip to content

Commit 6dcdac4

Browse files
committed
Fix up rustjswasm
1 parent f3ffa74 commit 6dcdac4

37 files changed

Lines changed: 522 additions & 267 deletions

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

rustjswasm/.gitignore.jinja

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,16 @@ js/coverage
138138
js/dist
139139
js/lib
140140
js/node_modules
141+
js/test-results
142+
js/playwright-report
141143
js/*.tgz
144+
{{module}}/extension
142145

143146
# Jupyter
144147
.ipynb_checkpoints
145148
.autoversion
149+
!{{module}}/extension/{{module}}.json
150+
!{{module}}/extension/install.json
146151
{{module}}/nbextension
147152
{{module}}/labextension
148153

rustjswasm/Makefile.jinja

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,22 @@ requirements-rs: ## install prerequisite rust build requirements
2626

2727
requirements: requirements-rs requirements-js requirements-py ## setup project for development
2828

29-
.PHONY: build-py build-js build-rs build dev
29+
.PHONY: build-py build-js build-rs build
3030
build-py:
31-
maturin build
31+
python -m build -w -n
3232

3333
build-js:
3434
cd js; pnpm build
3535

3636
build-rs:
3737
make -C rust build
3838

39-
dev: build ## lightweight in-place build for iterative dev
40-
$(_CP_COMMAND)
41-
4239
build: build-rs build-js build-py ## build the project
4340

4441
.PHONY: install
4542
install: ## install python library
4643
uv pip install .
4744

48-
UNAME := $(shell uname)
49-
ifeq ($(UNAME), Darwin)
50-
_CP_COMMAND := cp target/debug/lib{{module}}.dylib {{module}}/{{module}}.abi3.so
51-
else
52-
_CP_COMMAND := cp target/debug/lib{{module}}.so {{module}}/{{module}}.abi3.so
53-
endif
54-
5545
#########
5646
# LINTS #
5747
#########

0 commit comments

Comments
 (0)