Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve dev script #88

Merged
merged 3 commits into from
Oct 11, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Build the extensions
run: |
set -eux
./scripts/install.sh
./scripts/dev_install.sh
pytest -vv -r ap --cov

build_extensions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
run: python -m pip install -U "jupyterlab>=4.0.0,<5"

- name: Install extension
run: ./scripts/install.sh collaborative
run: ./scripts/dev_install.sh collaborative

- uses: jupyterlab/maintainer-tools/.github/actions/update-snapshots@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion binder/postBuild
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Distributed under the terms of the Modified BSD License.

# Install collaborative chat
./scripts/install.sh collaborative
./scripts/dev_install.sh collaborative

jupyter troubleshoot
jupyter notebook --show-config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The following commands install the extension in development mode:

```bash
# Install the extension
./scripts/install.sh collaborative
./scripts/dev_install.sh collaborative

# Symlink the assets
jupyter labextension develop --overwrite python/jupyterlab-collaborative-chat
Expand Down
2 changes: 1 addition & 1 deletion docs/source/developers/contributing/jupyterlab-ws-chat.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The following commands install the extension in development mode:

```bash
# Install the extension
./scripts/install.sh ws
./scripts/dev_install.sh ws

# Symlink the assets
jupyter labextension develop --overwrite python/jupyterlab-ws-chat
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"clean": "lerna run clean",
"clean:all": "lerna run clean:all",
"dev": "jupyter lab --config playground/config.py",
"dev-install": "lerna run dev-install --stream",
"dev-uninstall": "lerna run dev-uninstall --stream",
"install-from-src": "lerna run install-from-src --stream",
"dev-install": "jlpm dev-install:collaborative && jlpm dev-install:ws",
"dev-install:collaborative": "jlpm build:collaborative && lerna run dev-install --scope=jupyterlab-collaborative-chat-extension --include-filtered-dependencies",
"dev-install:ws": "jlpm build:ws && lerna run dev-install --scope=jupyterlab-ws-chat-extension --include-filtered-dependencies",
"lint": "jlpm && lerna run prettier && lerna run eslint",
"lint:check": "lerna run prettier:check && lerna run eslint:check",
"watch": "lerna run watch --parallel --stream",
Expand Down
1 change: 1 addition & 0 deletions python/jupyterlab-collaborative-chat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"clean:lintcache": "rimraf .eslintcache .stylelintcache",
"clean:labextension": "rimraf jupyterlab_collaborative_chat/labextension jupyterlab_collaborative_chat/_version.py",
"clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
"dev-install": "pip install -e \".[test]\" && jupyter labextension develop . --overwrite",
"eslint": "jlpm eslint:check --fix",
"eslint:check": "eslint . --cache --ext .ts,.tsx",
"install:extension": "jlpm build",
Expand Down
1 change: 1 addition & 0 deletions python/jupyterlab-ws-chat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"clean:lintcache": "rimraf .eslintcache .stylelintcache",
"clean:labextension": "rimraf jupyterlab_ws_chat/labextension jupyterlab_ws_chat/_version.py",
"clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
"dev-install": "pip install -e \".[test]\" && jupyter labextension develop . --overwrite",
"eslint": "jlpm eslint:check --fix",
"eslint:check": "eslint . --cache --ext .ts,.tsx",
"install:extension": "jlpm build",
Expand Down
17 changes: 17 additions & 0 deletions scripts/dev_install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.

EXTENSION=$1

# install dependencies
pip install jupyterlab~=4.0

# install typescript dependencies
jlpm install

if [ -z "${EXTENSION}" ]; then
jlpm dev-install
else
jlpm dev-install:${EXTENSION}
fi
25 changes: 0 additions & 25 deletions scripts/install.sh

This file was deleted.

Loading