Skip to content

Commit 4d99b35

Browse files
authoredNov 12, 2024··
Merge pull request #4823 from plotly/anywidget
Switch to use anywidget
·
v6.1.2v6.0.0rc0
2 parents 972a59d + 6d3f0a7 commit 4d99b35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4086
-14368
lines changed
 

‎.circleci/config.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ commands:
4646
. venv/bin/activate
4747
pip install --upgrade pip wheel
4848
pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
49+
cd js
50+
npm ci
51+
npm run build
4952
- run:
5053
name: Install plotly-geo
5154
command: |
@@ -347,9 +350,9 @@ jobs:
347350
. venv/bin/activate
348351
pip install --upgrade pip wheel
349352
pip install -r ./test_requirements/requirements_38_core.txt black inflect
350-
pip install jupyterlab~=3.0
353+
pip install jupyterlab
351354
- run:
352-
name: Update jupyterlab-plotly version
355+
name: Update jupyter widget plotly.js version
353356
command: |
354357
cd packages/python/plotly
355358
. venv/bin/activate
@@ -403,7 +406,7 @@ jobs:
403406
conda config --remove channels defaults
404407
conda config --add channels conda-forge
405408
conda create -n env --yes python=3.9 conda-build=3.28.4 conda-verify
406-
conda install -n env -c conda-forge jupyterlab=3 nodejs=16
409+
conda install -n env -c conda-forge jupyterlab nodejs=16
407410
conda init bash
408411
mkdir output
409412
@@ -412,9 +415,9 @@ jobs:
412415
command: |
413416
eval "$(conda shell.bash hook)"
414417
conda activate env
415-
cd packages/javascript/jupyterlab-plotly
418+
cd packages/python/plotly/js
416419
npm ci
417-
npm run build:prod
420+
npm run build
418421
git status
419422
420423
- run:
@@ -438,13 +441,13 @@ jobs:
438441
git status
439442
440443
- run:
441-
name: NPM Pack
444+
name: Build Widget javascript bundle
442445
command: |
443446
eval "$(conda shell.bash hook)"
444447
conda activate env
445-
cd packages/javascript/jupyterlab-plotly
446-
npm pack
447-
mv jupyterlab-plotly*.tgz ../../../output
448+
cd packages/python/plotly/js
449+
npm ci
450+
npm run build
448451
449452
- run:
450453
name: Zip output
@@ -491,7 +494,12 @@ jobs:
491494
pip install -r requirements.txt
492495
if [ "${CIRCLE_BRANCH}" != "doc-prod" ]; then
493496
pip uninstall -y plotly
494-
pip install -e ../packages/python/plotly
497+
cd ../packages/python/plotly
498+
pip install -e .
499+
cd js
500+
npm ci
501+
npm run build
502+
cd ../../../../doc
495503
fi
496504
cd ..
497505
- run:

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ doc/check-or-enforce-order.py
5959
packages/javascript/jupyterlab-plotly/lib/
6060
packages/python/plotly/jupyterlab_plotly/labextension/
6161
packages/python/plotly/jupyterlab_plotly/nbextension/index.js*
62+
packages/python/plotly/plotly/package_data/widgetbundle.js
6263

6364
test/percy/*.html
6465
test/percy/pandas2/*.html

0 commit comments

Comments
 (0)
Please sign in to comment.