Skip to content

Commit e1a20b0

Browse files
authored
Merge pull request #331 from finos/copier-update-2026-02-22T05-27-44
Update from copier (2026-02-22T05:27:44)
2 parents 56e3864 + 1ffdc22 commit e1a20b0

File tree

9 files changed

+27
-108
lines changed

9 files changed

+27
-108
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: 4f23417
2+
_commit: 08a244d
33
_src_path: https://github.com/python-project-templates/base.git
44
add_docs: false
55
add_extension: jupyter

.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,12 @@ js/node_modules
141141
js/test-results
142142
js/playwright-report
143143
js/*.tgz
144-
jupyterlab_templates/extension
145144

146145
# Jupyter
147146
.ipynb_checkpoints
148147
.autoversion
149148
Untitled*.ipynb
150-
!jupyterlab_templates/extension/jupyterlab_templates.json
151-
!jupyterlab_templates/extension/install.json
149+
jupyterlab_templates/extension
152150
jupyterlab_templates/nbextension
153151
jupyterlab_templates/labextension
154152

@@ -157,3 +155,7 @@ jupyterlab_templates/labextension
157155

158156
# Rust
159157
target
158+
159+
# Hydra
160+
outputs/
161+
multirun/

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,15 @@ format: fix
7373
################
7474
# Other Checks #
7575
################
76-
.PHONY: check-manifest checks check
76+
.PHONY: check-dist check-types checks check
7777

78-
check-manifest: ## check python sdist manifest with check-manifest
79-
check-manifest -v
78+
check-dist: ## check python sdist and wheel with check-dist
79+
check-dist -v
8080

81-
checks: check-manifest
81+
check-types: ## check python types with ty
82+
ty check --python $$(which python)
83+
84+
checks: check-dist
8285

8386
# alias
8487
check: checks

js/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
},
3434
"scripts": {
3535
"build:babel": "babel src/ --source-maps --out-dir lib/",
36+
"build:extension": "mkdirp ../jupyterlab_templates/extension/ && cpy --flat 'src/extension/*' '../jupyterlab_templates/extension/'",
3637
"build:nbextension": "mkdirp ../jupyterlab_templates/nbextension/static/ && cpy --flat 'src/notebook.js' '../jupyterlab_templates/nbextension/static/'",
3738
"build:labextension": "rimraf ../jupyterlab_templates/labextension && jupyter labextension build .",
38-
"build": "pnpm clean && pnpm build:babel && pnpm build:labextension && pnpm build:nbextension",
39+
"build": "pnpm clean && pnpm build:babel && pnpm build:extension && pnpm build:labextension && pnpm build:nbextension",
3940
"clean": "rimraf lib",
4041
"fix": "pnpm lint --fix",
4142
"lint": "eslint -c .eslintrc.js --ext .js src/ tests/",
File renamed without changes.
File renamed without changes.

jupyterlab_templates/templates/jupyterlab_templates/Sample.ipynb

Lines changed: 0 additions & 70 deletions
This file was deleted.

jupyterlab_templates/extension/notebook_templates/jupyterlab_templates/Sample.ipynb renamed to jupyterlab_templates/templates/notebook_templates/jupyterlab_templates/Sample.ipynb

File renamed without changes.

pyproject.toml

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ requires = [
44
"hatch-js",
55
"jupyterlab>=4,<5",
66
]
7-
build-backend="hatchling.build"
7+
build-backend = "hatchling.build"
88

99
[project]
1010
name = "jupyterlab-templates"
@@ -47,16 +47,16 @@ dependencies = [
4747
develop = [
4848
"build",
4949
"bump-my-version",
50-
"check-manifest",
51-
"codespell>=2.4,<2.5",
50+
"check-dist",
51+
"codespell",
5252
"hatch-js",
5353
"hatchling",
54-
"mdformat>=0.7.22,<1.1",
54+
"mdformat",
5555
"mdformat-tables>=1",
5656
"jupyterlab>=4,<5",
5757
"pytest",
5858
"pytest-cov",
59-
"ruff>=0.9,<0.15",
59+
"ruff",
6060
"twine",
6161
"ty",
6262
"uv",
@@ -95,30 +95,12 @@ filename = ":binder/requirements.txt"
9595
search = "jupyterlab_templates=={current_version}"
9696
replace = "jupyterlab_templates=={new_version}"
9797

98-
[tool.check-manifest]
99-
ignore = [
100-
".copier-answers.yaml",
101-
"js/pnpm-lock.yaml",
102-
"AUTHORS",
103-
"CONTRIBUTING.md",
104-
"GOVERNANCE.md",
105-
"Makefile",
106-
"NOTICE",
107-
".vscode/*",
108-
"binder/**/*",
109-
"docs/**/*",
110-
"js/dist/**/*",
111-
"js/lib/*",
112-
"jupyterlab_templates/extension/**",
113-
"jupyterlab_templates/labextension/**",
114-
"jupyterlab_templates/nbextension/**",
115-
]
116-
11798
[tool.coverage.run]
11899
branch = true
119100
omit = [
120101
"jupyterlab_templates/tests/integration/",
121102
]
103+
122104
[tool.coverage.report]
123105
exclude_also = [
124106
"raise NotImplementedError",
@@ -143,24 +125,25 @@ packages = [
143125
"js",
144126
]
145127
exclude = [
146-
"/binder",
147-
"/js/dist",
148-
"/js/node_modules",
128+
"binder",
129+
"js/dist",
130+
"js/node_modules",
149131
]
150132

151133
[tool.hatch.build.targets.wheel]
152134
packages = [
153135
"jupyterlab_templates",
154136
]
155137
exclude = [
156-
"/binder",
157-
"/js",
138+
"binder",
139+
"js",
158140
]
159141

160142
[tool.hatch.build.targets.wheel.shared-data]
161143
"jupyterlab_templates/labextension" = "share/jupyter/labextensions/jupyterlab-templates"
162144
"jupyterlab_templates/extension/install.json" = "share/jupyter/labextensions/jupyterlab-templates/install.json"
163145
"jupyterlab_templates/extension/jupyterlab_templates.json" = "etc/jupyter/jupyter_server_config.d/jupyterlab_templates.json"
146+
"jupyterlab_templates/templates/notebook_templates" = "share/jupyter/notebook"
164147

165148
[tool.hatch.build.hooks.hatch-js]
166149
path = "js"

0 commit comments

Comments
 (0)