Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,15 @@ test-cpp:
test-js:
cd ../python-template-js && 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"
cd ../python-template-js && make develop
cd ../python-template-js && git add js/pnpm-lock.yaml && git commit -m "lockfile"
cd ../python-template-js && make lint
cd ../python-template-js && make checks
cd ../python-template-js && make test

test-jupyter:
cd ../python-template-jupyter && 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"
cd ../python-template-jupyter && make develop
cd ../python-template-jupyter && git add js/pnpm-lock.yaml && git commit -m "lockfile"
cd ../python-template-jupyter && make lint
cd ../python-template-jupyter && make checks
cd ../python-template-jupyter && make test
Expand All @@ -95,13 +97,15 @@ test-rustjswasm:
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"
cd ../python-template-rustjswasm && make develop
cd ../python-template-rustjswasm && git add Cargo.lock && git commit -m "lockfile"
cd ../python-template-rustjswasm && git add js/pnpm-lock.yaml && git commit -m "lockfile"
cd ../python-template-rustjswasm && make lint
cd ../python-template-rustjswasm && make checks
cd ../python-template-rustjswasm && make test

test-cppjswasm:
cd ../python-template-cppjswasm && 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"
cd ../python-template-cppjswasm && make develop
cd ../python-template-cppjswasm && git add js/pnpm-lock.yaml && git commit -m "lockfile"
cd ../python-template-cppjswasm && make lint
cd ../python-template-cppjswasm && make checks
cd ../python-template-cppjswasm && make test
8 changes: 5 additions & 3 deletions cpp/.gitignore.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,12 @@ js/node_modules
js/test-results
js/playwright-report
js/*.tgz
{{module}}/extension

# Jupyter
.ipynb_checkpoints
.autoversion
Untitled*.ipynb
!{{module}}/extension/{{module}}.json
!{{module}}/extension/install.json
{{module}}/extension
{{module}}/nbextension
{{module}}/labextension

Expand All @@ -157,3 +155,7 @@ Untitled*.ipynb

# Rust
target

# Hydra
outputs/
multirun/
4 changes: 1 addition & 3 deletions cppjswasm/.gitignore.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,12 @@ js/node_modules
js/test-results
js/playwright-report
js/*.tgz
{{module}}/extension

# Jupyter
.ipynb_checkpoints
.autoversion
Untitled*.ipynb
!{{module}}/extension/{{module}}.json
!{{module}}/extension/install.json
{{module}}/extension
{{module}}/nbextension
{{module}}/labextension

Expand Down
2 changes: 1 addition & 1 deletion examples/rustjswasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ add_wiki: true
add_extension: rustjswasm
email: 3105306+timkpaine@users.noreply.github.com
github: python-project-templates
project_description: A Rust-Python project template
project_description: A Rust-JavaScript-Python project template
project_name: python template rustjswasm
python_version_primary: '3.11'
team: Python Project Template Authors
8 changes: 5 additions & 3 deletions js/.gitignore.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,12 @@ js/node_modules
js/test-results
js/playwright-report
js/*.tgz
{{module}}/extension

# Jupyter
.ipynb_checkpoints
.autoversion
Untitled*.ipynb
!{{module}}/extension/{{module}}.json
!{{module}}/extension/install.json
{{module}}/extension
{{module}}/nbextension
{{module}}/labextension

Expand All @@ -157,3 +155,7 @@ Untitled*.ipynb

# Rust
target

# Hydra
outputs/
multirun/
10 changes: 5 additions & 5 deletions js/Makefile.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ format: fix
################
# Other Checks #
################
.PHONY: check-manifest check-dist checks check

check-manifest: ## check python sdist manifest with check-manifest
check-manifest -v
.PHONY: check-dist check-types checks check

check-dist: ## check python sdist and wheel with check-dist
check-dist -v

checks: check-manifest
check-types: ## check python types with ty
ty check --python $$(which python)

checks: check-dist

# alias
check: checks
Expand Down
18 changes: 3 additions & 15 deletions js/pyproject.toml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ develop = [
"build",
"bump-my-version",
"check-dist",
"check-manifest",
"codespell",
"hatch-js",
"hatchling",
Expand Down Expand Up @@ -79,17 +78,6 @@ filename = "js/package.json"
search = '"version": "{current_version}"'
replace = '"version": "{new_version}"'

[tool.check-manifest]
ignore = [
".copier-answers.yaml",
"js/pnpm-lock.yaml",
"Makefile",
".vscode/*",
"{{module}}/extension/**/*",
"docs/**/*",
"js/dist/**/*",
]

[tool.coverage.run]
branch = true
omit = [
Expand Down Expand Up @@ -118,16 +106,16 @@ packages = [
"js",
]
exclude = [
"/js/dist",
"/js/node_modules",
"js/dist",
"js/node_modules",
]

[tool.hatch.build.targets.wheel]
packages = [
"{{module}}",
]
exclude = [
"/js",
"js",
]

[tool.hatch.build.hooks.hatch-js]
Expand Down
8 changes: 5 additions & 3 deletions jupyter/.gitignore.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,12 @@ js/node_modules
js/test-results
js/playwright-report
js/*.tgz
{{module}}/extension

# Jupyter
.ipynb_checkpoints
.autoversion
Untitled*.ipynb
!{{module}}/extension/{{module}}.json
!{{module}}/extension/install.json
{{module}}/extension
{{module}}/nbextension
{{module}}/labextension

Expand All @@ -157,3 +155,7 @@ Untitled*.ipynb

# Rust
target

# Hydra
outputs/
multirun/
10 changes: 5 additions & 5 deletions jupyter/Makefile.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ format: fix
################
# Other Checks #
################
.PHONY: check-manifest check-dist checks check

check-manifest: ## check python sdist manifest with check-manifest
check-manifest -v
.PHONY: check-dist check-types checks check

check-dist: ## check python sdist and wheel with check-dist
check-dist -v

checks: check-manifest
check-types: ## check python types with ty
ty check --python $$(which python)

checks: check-dist

# alias
check: checks
Expand Down
3 changes: 2 additions & 1 deletion jupyter/js/package.json.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@
},
"scripts": {
"build:babel": "babel src/ --source-maps --out-dir lib/",
"build:extension": "mkdirp ../{{module}}/extension/ && cpy --flat 'src/extension/*' '../{{module}}/extension/'",
"build:nbextension": "mkdirp ../{{module}}/nbextension/static/ && cpy --flat 'src/notebook.js' '../{{module}}/nbextension/static/'",
"build:labextension": "rimraf ../{{module}}/labextension && jupyter labextension build .",
"build": "pnpm clean && pnpm build:babel && pnpm build:labextension && pnpm build:nbextension",
"build": "pnpm clean && pnpm build:babel && pnpm build:extension && pnpm build:labextension && pnpm build:nbextension",
"clean": "rimraf lib",
"fix": "pnpm lint --fix",
"lint": "eslint -c .eslintrc.js --ext .js src/ tests/",
Expand Down
21 changes: 3 additions & 18 deletions jupyter/pyproject.toml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ develop = [
"build",
"bump-my-version",
"check-dist",
"check-manifest",
"codespell",
"hatch-js",
"hatchling",
Expand Down Expand Up @@ -83,20 +82,6 @@ filename = "js/package.json"
search = '"version": "{current_version}"'
replace = '"version": "{new_version}"'

[tool.check-manifest]
ignore = [
".copier-answers.yaml",
"js/pnpm-lock.yaml",
"Makefile",
".vscode/*",
"{{module}}/extension/**",
"{{module}}/labextension/**",
"{{module}}/nbextension/**",
"docs/**/*",
"js/dist/**/*",
"js/lib/*",
]

[tool.coverage.run]
branch = true
omit = [
Expand Down Expand Up @@ -126,16 +111,16 @@ packages = [
"js",
]
exclude = [
"/js/dist",
"/js/node_modules",
"js/dist",
"js/node_modules",
]

[tool.hatch.build.targets.wheel]
packages = [
"{{module}}",
]
exclude = [
"/js"
"js"
]

[tool.hatch.build.targets.wheel.shared-data]
Expand Down
8 changes: 5 additions & 3 deletions python/.gitignore.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,12 @@ js/node_modules
js/test-results
js/playwright-report
js/*.tgz
{{module}}/extension

# Jupyter
.ipynb_checkpoints
.autoversion
Untitled*.ipynb
!{{module}}/extension/{{module}}.json
!{{module}}/extension/install.json
{{module}}/extension
{{module}}/nbextension
{{module}}/labextension

Expand All @@ -157,3 +155,7 @@ Untitled*.ipynb

# Rust
target

# Hydra
outputs/
multirun/
8 changes: 5 additions & 3 deletions rust/.gitignore.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,12 @@ js/node_modules
js/test-results
js/playwright-report
js/*.tgz
{{module}}/extension

# Jupyter
.ipynb_checkpoints
.autoversion
Untitled*.ipynb
!{{module}}/extension/{{module}}.json
!{{module}}/extension/install.json
{{module}}/extension
{{module}}/nbextension
{{module}}/labextension

Expand All @@ -157,3 +155,7 @@ Untitled*.ipynb

# Rust
target

# Hydra
outputs/
multirun/
2 changes: 1 addition & 1 deletion rust/Cargo.toml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[lib]
name = "{{module}}"
path = "src/lib.rs"
path = "rust/python/lib.rs"
crate-type = ["cdylib"]

[dependencies]
Expand Down
10 changes: 5 additions & 5 deletions rust/Makefile.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ format: fix
################
# Other Checks #
################
.PHONY: check-manifest check-dist checks check

check-manifest: ## check python sdist manifest with check-manifest
check-manifest -v
.PHONY: check-dist check-types checks check

check-dist: ## check python sdist and wheel with check-dist
check-dist -v

checks: check-manifest
check-types: ## check python types with ty
ty check --python $$(which python)

checks: check-dist

# alias
check: checks
Expand Down
15 changes: 1 addition & 14 deletions rust/pyproject.toml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ develop = [
"build",
"bump-my-version",
"check-dist",
"check-manifest",
"cibuildwheel",
"codespell",
"hatch-rs",
Expand Down Expand Up @@ -86,17 +85,6 @@ filename = "rust/Cargo.toml"
search = 'version = "{current_version}"'
replace = 'version = "{new_version}"'

[tool.check-manifest]
ignore = [
".copier-answers.yaml",
"Cargo.toml",
"Cargo.lock",
"Makefile",
"docs/**/*",
"rust/**/*",
"src/**/*",
]

[tool.cibuildwheel]
build = "cp310-*"
test-command = "pytest -vvv {project}/{{module}}/tests"
Expand Down Expand Up @@ -152,14 +140,13 @@ path = "."
[tool.hatch.build.targets.sdist]
packages = [
"{{module}}",
]
include = [
"rust",
"src",
"Cargo.toml",
"Cargo.lock",
]
exclude = [
"rust/Makefile",
"target",
]

Expand Down
File renamed without changes.
File renamed without changes.
Loading
Loading