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: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Install dependencies
run: python -m pip install -U "jupyterlab>=4.0.0,<5"
run: python -m pip install -U "jupyterlab>=4.6.0,<5"

- name: Lint the extension
run: |
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
sudo rm -rf $(which node)
sudo rm -rf $(which node)

pip install "jupyterlab>=4.0.0,<5" jupyterlite_javascript_kernel*.whl
pip install "jupyterlab>=4.6.0,<5" jupyterlite_javascript_kernel*.whl


jupyter labextension list
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ The `jlpm` command is JupyterLab's pinned version of
# Clone the repo to your local environment
# Change directory to the jupyterlite-javascript-kernel directory
# Install package in development mode
pip install -e "."
pip install -e ".[dev]"
# Link your development version of the extension with JupyterLab
jupyter labextension develop . --overwrite
jupyter-builder develop . --overwrite
# Rebuild extension Typescript source after making changes
jlpm build
```
Expand Down Expand Up @@ -299,7 +299,7 @@ jupyter lab build --minimize=False
pip uninstall jupyterlite-javascript-kernel
```

In development mode, you will also need to remove the symlink created by `jupyter labextension develop`
In development mode, you will also need to remove the symlink created by `jupyter-builder develop`
command. To find its location, you can run `jupyter labextension list` to figure out where the `labextensions`
folder is located. Then you can remove the symlink named `@jupyterlite/javascript-kernel` within that folder.

Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ dependencies:
- pip
- python=3.11
- ipywidgets>=8.1,<9
- jupyterlab>=4.5.0,<5
- jupyterlab>=4.6.0,<5
- nodejs=22
- jupyterlite-core>=0.7.0,<0.8
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"clean": "lerna run clean",
"clean:all": "lerna run clean && rimraf node_modules",
"install:dev": "yarn run build:prod && yarn run develop",
"install:extension": "jupyter labextension develop --overwrite .",
"install:extension": "jupyter-builder develop --overwrite .",
"eslint": "eslint . --ext .ts,.tsx --fix",
"eslint:check": "eslint . --ext .ts,.tsx",
"lint": "yarn run eslint && yarn run prettier",
Expand Down
8 changes: 4 additions & 4 deletions packages/javascript-kernel-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
],
"scripts": {
"build": "jlpm build:lib && jlpm build:labextension:dev",
"build:labextension": "jupyter labextension build .",
"build:labextension:dev": "jupyter labextension build --development True .",
"build:labextension": "jupyter-builder build .",
"build:labextension:dev": "jupyter-builder build --development True .",
"build:lib": "tsc -b",
"build:prod": "jlpm clean && jlpm build:lib && jlpm build:labextension",
"clean": "jlpm clean:lib",
Expand All @@ -35,7 +35,7 @@
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
"install:extension": "jlpm build",
"watch": "run-p watch:src watch:labextension",
"watch:labextension": "jupyter labextension watch .",
"watch:labextension": "jupyter-builder watch .",
"watch:src": "tsc -w"
},
"dependencies": {
Expand All @@ -46,7 +46,7 @@
"@lumino/signaling": "^2.1.5"
},
"devDependencies": {
"@jupyter/builder": "^1.0.2",
"@jupyter/builder": "^1.2.0",
"npm-run-all2": "^7.0.1",
"rimraf": "~5.0.1",
"typescript": "~5.0.2"
Expand Down
12 changes: 9 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5", "hatch-nodejs-version>=0.3.2"]
requires = ["hatchling>=1.5.0", "hatch-nodejs-version>=0.3.2", "jupyter-builder>=1.2.0,<2"]
build-backend = "hatchling.build"

[project]
Expand All @@ -25,6 +25,12 @@ classifiers = [
dependencies = []
dynamic = ["version", "description", "authors", "urls", "keywords"]

[project.optional-dependencies]
dev = [
"jupyterlab>=4.6.0,<5",
"jupyter-builder>=1.2.0,<2",
]

[tool.hatch.version]
source = "nodejs"

Expand Down Expand Up @@ -66,11 +72,11 @@ version_cmd = "python scripts/bump-version.py"

[tool.jupyter-releaser.hooks]
before-bump-version = [
"python -m pip install 'jupyterlab>=4.0.0,<5'",
"python -m pip install 'jupyter-builder>=1.2.0,<2'",
"jlpm",
]
before-build-npm = [
"python -m pip install 'jupyterlab>=4.0.0,<5'",
"python -m pip install 'jupyter-builder>=1.2.0,<2'",
"jlpm",
"jlpm build:prod"
]
Expand Down
Loading
Loading