Skip to content
This repository has been archived by the owner on Feb 14, 2024. It is now read-only.

Commit

Permalink
Add more skip-if-exists, fix wheel packaging (#181)
Browse files Browse the repository at this point in the history
* Add more skip-if-exists

* remove wheel config

* fix typo

* Remove before-build-python hook

* Re-add `wasm` to files

* Fix build:prod script

* Delete MANIFEST.in

* edit config

* include static directory explicitely ?

* narrow down gitignore

* fix typo
  • Loading branch information
jtpio authored Oct 18, 2023
1 parent e1371a8 commit 90f5ac5
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 45 deletions.
18 changes: 10 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ node_modules/
*.egg-info/
.ipynb_checkpoints
*.tsbuildinfo
*.tar.gz
empack_env_meta.json
/*.tar.gz
# Created by https://www.gitignore.io/api/python
# Edit at https://www.gitignore.io/?templates=python

Expand Down Expand Up @@ -114,15 +113,18 @@ dmypy.json
_output
*.doit.db

python_data.js
*.data
# Generated files
src/python_data.js
src/*.data
src/*.js
xpython_wasm.js
xpython_wasm.wasm
xpython_wasm.hash

src/xpython_wasm.js
src/xpython_wasm.wasm
src/xpython_wasm.hash
src/worker.ts
src/web_worker_kernel.ts
src/*.tar.gz
src/empack_env_meta.json
*.js.map

# Labextension
jupyterlite_xeus_python/labextension
Expand Down
30 changes: 0 additions & 30 deletions MANIFEST.in

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"license": "BSD-3-Clause",
"author": "JupyterLite Contributors",
"files": [
"lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
"lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf,wasm}",
"style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf}"
],
"main": "lib/index.js",
Expand All @@ -31,7 +31,7 @@
"build": "jlpm run build:xeus-python && jlpm run build:lib && jlpm run build:worker && jlpm run copy-files && jlpm run build:labextension:dev",
"build:xeus-python": "python jupyterlite_xeus_python/build.py --output-path src --build-worker",
"build:worker:prod": "webpack --config worker.webpack.config.js --mode=production",
"build:prod": "jlpm run clean && jlpm run build build:xeus-python && jlpm run build:lib:prod && jlpm run build:worker:prod && jlpm run copy-files && jlpm run build:labextension",
"build:prod": "jlpm run clean && jlpm run build:xeus-python && jlpm run build:lib:prod && jlpm run build:worker:prod && jlpm run copy-files && jlpm run build:labextension",
"build:labextension": "jupyter labextension build .",
"build:labextension:dev": "jupyter labextension build --development True .",
"build:lib": "tsc --sourceMap",
Expand Down
14 changes: 9 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ fields = ["description", "authors", "urls"]
artifacts = ["jupyterlite_xeus_python/labextension"]
exclude = [".github"]

[tool.hatch.build.targets.wheel]
artifacts = ["jupyterlite_xeus_python/labextension"]
include = ["jupyterlite_xeus_python/"]

[tool.hatch.build.targets.wheel.shared-data]
"jupyterlite_xeus_python/labextension" = "share/jupyter/labextensions/@jupyterlite/xeus-python-kernel"
"install.json" = "share/jupyter/labextensions/@jupyterlite/xeus-python-kernel/install.json"
Expand All @@ -73,11 +69,19 @@ ensured-targets = [
"jupyterlite_xeus_python/labextension/static/xpython_wasm.wasm",
"jupyterlite_xeus_python/labextension/package.json",
]
skip-if-exists = ["jupyterlite_xeus_python/labextension/static/style.js"]
skip-if-exists = [
"jupyterlite_xeus_python/labextension/static/style.js",
"jupyterlite_xeus_python/labextension/static/empack_env_meta.json",
"jupyterlite_xeus_python/labextension/static/xpython_wasm.js",
"jupyterlite_xeus_python/labextension/static/xpython_wasm.wasm",
"jupyterlite_xeus_python/labextension/package.json",
]

[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
build_cmd = "build:prod"
npm = ["jlpm"]
source_dir = "src"
build_dir = "jupyterlite_xeus_python/labextension"

[tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]
build_cmd = "install:extension"
Expand Down

0 comments on commit 90f5ac5

Please sign in to comment.