Skip to content

Commit ec16bcf

Browse files
authored
Improve dev script (#88)
* Add the dev-install scripts * Use the script in install script * Rename dev install bash script
1 parent f75b710 commit ec16bcf

File tree

10 files changed

+27
-33
lines changed

10 files changed

+27
-33
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Build the extensions
5858
run: |
5959
set -eux
60-
./scripts/install.sh
60+
./scripts/dev_install.sh
6161
pytest -vv -r ap --cov
6262
6363
build_extensions:

.github/workflows/update-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
run: python -m pip install -U "jupyterlab>=4.0.0,<5"
7373

7474
- name: Install extension
75-
run: ./scripts/install.sh collaborative
75+
run: ./scripts/dev_install.sh collaborative
7676

7777
- uses: jupyterlab/maintainer-tools/.github/actions/update-snapshots@v1
7878
with:

binder/postBuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Distributed under the terms of the Modified BSD License.
55

66
# Install collaborative chat
7-
./scripts/install.sh collaborative
7+
./scripts/dev_install.sh collaborative
88

99
jupyter troubleshoot
1010
jupyter notebook --show-config

docs/source/developers/contributing/jupyterlab-collaborative-chat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The following commands install the extension in development mode:
1717

1818
```bash
1919
# Install the extension
20-
./scripts/install.sh collaborative
20+
./scripts/dev_install.sh collaborative
2121

2222
# Symlink the assets
2323
jupyter labextension develop --overwrite python/jupyterlab-collaborative-chat

docs/source/developers/contributing/jupyterlab-ws-chat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The following commands install the extension in development mode:
1717

1818
```bash
1919
# Install the extension
20-
./scripts/install.sh ws
20+
./scripts/dev_install.sh ws
2121

2222
# Symlink the assets
2323
jupyter labextension develop --overwrite python/jupyterlab-ws-chat

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
"clean": "lerna run clean",
3636
"clean:all": "lerna run clean:all",
3737
"dev": "jupyter lab --config playground/config.py",
38-
"dev-install": "lerna run dev-install --stream",
39-
"dev-uninstall": "lerna run dev-uninstall --stream",
40-
"install-from-src": "lerna run install-from-src --stream",
38+
"dev-install": "jlpm dev-install:collaborative && jlpm dev-install:ws",
39+
"dev-install:collaborative": "jlpm build:collaborative && lerna run dev-install --scope=jupyterlab-collaborative-chat-extension --include-filtered-dependencies",
40+
"dev-install:ws": "jlpm build:ws && lerna run dev-install --scope=jupyterlab-ws-chat-extension --include-filtered-dependencies",
4141
"lint": "jlpm && lerna run prettier && lerna run eslint",
4242
"lint:check": "lerna run prettier:check && lerna run eslint:check",
4343
"watch": "lerna run watch --parallel --stream",

python/jupyterlab-collaborative-chat/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"clean:lintcache": "rimraf .eslintcache .stylelintcache",
4242
"clean:labextension": "rimraf jupyterlab_collaborative_chat/labextension jupyterlab_collaborative_chat/_version.py",
4343
"clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
44+
"dev-install": "pip install -e \".[test]\" && jupyter labextension develop . --overwrite",
4445
"eslint": "jlpm eslint:check --fix",
4546
"eslint:check": "eslint . --cache --ext .ts,.tsx",
4647
"install:extension": "jlpm build",

python/jupyterlab-ws-chat/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"clean:lintcache": "rimraf .eslintcache .stylelintcache",
4242
"clean:labextension": "rimraf jupyterlab_ws_chat/labextension jupyterlab_ws_chat/_version.py",
4343
"clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
44+
"dev-install": "pip install -e \".[test]\" && jupyter labextension develop . --overwrite",
4445
"eslint": "jlpm eslint:check --fix",
4546
"eslint:check": "eslint . --cache --ext .ts,.tsx",
4647
"install:extension": "jlpm build",

scripts/dev_install.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
# Copyright (c) Jupyter Development Team.
3+
# Distributed under the terms of the Modified BSD License.
4+
5+
EXTENSION=$1
6+
7+
# install dependencies
8+
pip install jupyterlab~=4.0
9+
10+
# install typescript dependencies
11+
jlpm install
12+
13+
if [ -z "${EXTENSION}" ]; then
14+
jlpm dev-install
15+
else
16+
jlpm dev-install:${EXTENSION}
17+
fi

scripts/install.sh

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

0 commit comments

Comments
 (0)