From da2542c97bd82cdea75e16be8238c23e86c01433 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Tue, 2 Nov 2021 10:52:23 -0700 Subject: [PATCH] Update dev-install and package.json so dev installs work. It was important to change the workspaces in package.json to point to the new locations so that yarn/lerna could find the new locations. I also updated the dev-install.sh to be consistent with how it was installing each python package. --- dev-install.sh | 9 +++------ package.json | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dev-install.sh b/dev-install.sh index 940ad0dcf91..7b78935fa7c 100755 --- a/dev-install.sh +++ b/dev-install.sh @@ -38,22 +38,19 @@ yarn install yarn run build echo -n "widgetsnbextension" -cd widgetsnbextension -pip install -v -e . +pip install -v -e ./python/widgetsnbextension if [[ "$OSTYPE" == "msys" ]]; then jupyter nbextension install --overwrite --py $nbExtFlags widgetsnbextension else jupyter nbextension install --overwrite --py --symlink $nbExtFlags widgetsnbextension fi jupyter nbextension enable --py $nbExtFlags widgetsnbextension -cd ../.. echo -n "ipywidgets" -cd python/ipywidgets -pip install -v -e ".[test]" -cd ../.. +pip install -v -e "./python/ipywidgets[test]" if test "$skip_jupyter_lab" != yes; then + echo -n "jupyterlab_ipywidgets" pip install jupyter_packaging pip install -ve ./python/jupyterlab_widgets jupyter labextension develop ./python/jupyterlab_widgets --overwrite diff --git a/package.json b/package.json index 982e446a7f9..d0dd9b350bc 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "private": true, "workspaces": [ "packages/*", - "widgetsnbextension", + "python/widgetsnbextension", "examples/*", - "jupyterlab_widgets" + "python/jupyterlab_widgets" ], "scripts": { "build": "lerna run build --ignore \"@jupyter-widgets/example-*\"",