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

Switch to use anywidget #4823

Merged
merged 86 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
8a148f2
Switch to use anywidget
Jul 14, 2024
e21e3d7
Merge branch 'master' of github.com:plotly/plotly.py into anywidget
marthacryan Sep 12, 2024
d5d245c
Merge branch 'remove-requirejs' of github.com:plotly/plotly.py into a…
marthacryan Sep 13, 2024
6355ee4
Add package.json esbuild command and update test requirements to incl…
marthacryan Sep 13, 2024
3abdc7f
Call bundle command in the CI
marthacryan Sep 13, 2024
88b327e
Fix filepath
marthacryan Sep 13, 2024
70d536f
Move js stuff to plotly
manzt Sep 16, 2024
3b9c192
Cleanup tsconfig and types for build
manzt Sep 16, 2024
a338e6f
Ignore bundle
manzt Sep 16, 2024
aaefdaf
Keep bundle in MANIFEST.in
manzt Sep 16, 2024
ebba1c5
Restore package/* from master
manzt Sep 16, 2024
6d2a372
Update target
manzt Sep 16, 2024
b27643d
Add anywidget comment
manzt Sep 16, 2024
d4277ac
Merge branch 'master' of github.com:plotly/plotly.py into anywidget
marthacryan Oct 9, 2024
e7b6d7a
Add warning message when notebook version < 7 is used
marthacryan Oct 11, 2024
590a4db
Move files under python/plotly
marthacryan Oct 11, 2024
cd7d587
remove old javascript and fix install
marthacryan Oct 15, 2024
4f2ce95
Remove nbextension
marthacryan Oct 15, 2024
cc77778
Reset changes to circleci
marthacryan Oct 17, 2024
23f387a
Merge branch 'master' of github.com:plotly/plotly.py into anywidget
marthacryan Oct 17, 2024
c53835e
Undo changes to CHANGELOG
marthacryan Oct 17, 2024
0c9ffc9
Revert changes to javascript directory
marthacryan Oct 17, 2024
0f16f0c
remove all jupyter extension code
marthacryan Oct 18, 2024
d1e24db
Add jsdeps to ci config
marthacryan Oct 18, 2024
5eff0ca
Merge branch 'anywidget' of github.com:marthacryan/plotly.py into dro…
marthacryan Oct 18, 2024
195ea4e
Merge with master
marthacryan Oct 21, 2024
ce96898
Add dep on anywidget
marthacryan Oct 21, 2024
a3d8650
Update error messages when anywidget isn't installed
marthacryan Oct 21, 2024
3bc3535
Update docstring
marthacryan Oct 21, 2024
b5870e8
Update test to rely on installation of anywidget rather than version
marthacryan Oct 21, 2024
9302d29
Rename widget test
marthacryan Oct 21, 2024
a60e803
Black
marthacryan Oct 21, 2024
54d9fe4
Update setup.py to include both widget and jupyterlab extension build
marthacryan Oct 21, 2024
204b052
fix filepath of jupyterlab extension root
marthacryan Oct 21, 2024
263ef26
Update circleci config to include both widget and jupyterlab extensio…
marthacryan Oct 21, 2024
846e7b5
Fix formatting of config file
marthacryan Oct 21, 2024
08d8052
Update circleci config to include both widget and jupyterlab extensio…
marthacryan Oct 21, 2024
28b27af
revert changes to pypi build
marthacryan Oct 21, 2024
eb70d86
Black
marthacryan Oct 21, 2024
a911f53
Remove extra call to setup.py
marthacryan Oct 21, 2024
2a7208f
Add jsdeps call to optional tests
marthacryan Oct 21, 2024
45fca22
Move jsdeps call to core tests
marthacryan Oct 21, 2024
cae0088
Reset javascript file
marthacryan Oct 22, 2024
93210e6
Move jsdeps to an earlier step
marthacryan Oct 22, 2024
f553634
Move jsdeps to an earlier step
marthacryan Oct 22, 2024
7664ac9
Merge branch 'master' of github.com:plotly/plotly.py into anywidget
marthacryan Oct 22, 2024
3578bac
Call npm run build directly in circle ci config
marthacryan Oct 22, 2024
0920b9d
restore changes to setup.py
marthacryan Oct 22, 2024
2dbdcea
Reset widget version
marthacryan Oct 22, 2024
612ceec
Merge with anywidget branch
marthacryan Oct 22, 2024
cb488ff
Remove npm from release instructions
marthacryan Oct 22, 2024
4096595
Remove more references to jupyterlab-plotly
marthacryan Oct 22, 2024
20886ef
Resolve ci failures
marthacryan Oct 22, 2024
f8fe306
Merge with anywidget
marthacryan Oct 22, 2024
35f848b
Fix filepath of bundled js
marthacryan Oct 23, 2024
3f6c8f7
Fix filepath to js bundle in setup.py
marthacryan Oct 23, 2024
5b97f05
Install before running npm build in ci
marthacryan Oct 23, 2024
3b94298
Merge branch 'anywidget' of github.com:plotly/plotly.py into drop-not…
marthacryan Oct 23, 2024
513798b
Remove npm pack of jupyterlab extension
marthacryan Oct 23, 2024
cede4e1
Remove requirement for ipywidgets
marthacryan Oct 23, 2024
a80250d
Move build step of js
marthacryan Oct 23, 2024
99013dc
Move widget bundle to package_data
marthacryan Oct 23, 2024
4ab2a0c
Update path in gitignore
marthacryan Oct 23, 2024
39e65af
Merge branch 'anywidget' of github.com:plotly/plotly.py into drop-not…
marthacryan Oct 23, 2024
25cbf52
Merge branch 'anywidget' of github.com:plotly/plotly.py into drop-not…
marthacryan Oct 23, 2024
8e3354d
Update path of bundle in setup.py
marthacryan Oct 23, 2024
60cc98f
update contributing to include new build instructions
marthacryan Oct 25, 2024
ce607bb
Merge branch 'master' of github.com:plotly/plotly.py into anywidget
marthacryan Oct 28, 2024
3d2a234
Merge branch 'anywidget' of github.com:plotly/plotly.py into drop-not…
marthacryan Oct 28, 2024
6d29ba6
Fix issues with vscode
marthacryan Oct 30, 2024
21fa7d0
Update to include lodash-es in package.json
marthacryan Oct 30, 2024
4bb303c
remove unnecessary global define
marthacryan Oct 30, 2024
4759697
Merge with anywidget
marthacryan Oct 30, 2024
e399c2d
Pin anywidget version in test requirements
marthacryan Oct 30, 2024
f6f2691
Remove more references to old jupyter support from README
marthacryan Nov 4, 2024
ee67f2e
Merge pull request #4822 from plotly/drop-notebook-6
marthacryan Nov 4, 2024
97d6cb1
Merge branch 'master' of github.com:plotly/plotly.py into anywidget
marthacryan Nov 4, 2024
7f241f3
Merge branch 'master' of github.com:plotly/plotly.py into anywidget
marthacryan Nov 7, 2024
dc87b3c
Create util for display jupyter version warnings and update imports
marthacryan Nov 7, 2024
22d90c4
Remove deprecated code
marthacryan Nov 7, 2024
bee13cd
Update jupyter version warnings to import jupyterlab later
marthacryan Nov 8, 2024
946590f
Merge with master
marthacryan Nov 12, 2024
3a85b8a
Switch to npm ci instead of npm i
marthacryan Nov 12, 2024
fc8eff2
Move warnings out of utils file to avoid psutils import error
marthacryan Nov 12, 2024
c65ca44
Fix import paths for new location of util
marthacryan Nov 12, 2024
6d3f0a7
Remove unused import
marthacryan Nov 12, 2024
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
17 changes: 14 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ commands:
. venv/bin/activate
pip install --upgrade pip wheel
pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
cd js
npm install
npm run build
- run:
name: Install plotly-geo
command: |
Expand Down Expand Up @@ -341,7 +344,7 @@ jobs:
pip install -r ./test_requirements/requirements_38_core.txt black inflect
pip install jupyterlab~=3.0
- run:
name: Update jupyterlab-plotly version
name: Update jupyterlab-plotly and jupyter widget plotly.js version
command: |
cd packages/python/plotly
. venv/bin/activate
Expand Down Expand Up @@ -407,7 +410,10 @@ jobs:
cd packages/javascript/jupyterlab-plotly
npm ci
npm run build:prod
git status

cd ../../python/plotly/js
npm install
npm run build

- run:
name: PyPI Build
Expand Down Expand Up @@ -483,7 +489,12 @@ jobs:
pip install -r requirements.txt
if [ "${CIRCLE_BRANCH}" != "doc-prod" ]; then
pip uninstall -y plotly
pip install -e ../packages/python/plotly
cd ../packages/python/plotly
pip install -e .
cd js
npm install
npm run build
cd ../../../../doc
fi
cd ..
- run:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ doc/check-or-enforce-order.py
packages/javascript/jupyterlab-plotly/lib/
packages/python/plotly/jupyterlab_plotly/labextension/
packages/python/plotly/jupyterlab_plotly/nbextension/index.js*
packages/python/plotly/plotly/package_data/widgetbundle.js

test/percy/*.html
test/percy/pandas2/*.html
2 changes: 1 addition & 1 deletion doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plotly==5.24.1
jupytext==1.16.4
ipywidgets==7.7.2
jupyter-client<7
jupyter
notebook
Expand Down Expand Up @@ -46,3 +45,4 @@ dask==2022.2.0
polars
geoparse<=2.0.3
xarray==2022.9.0
anywidget
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ retrying==1.3.3
pytest==3.5.1
pandas==0.23.2
numpy==1.14.3
ipywidgets==7.2.0
anywidget
matplotlib==2.2.3
--editable=./plotly
1 change: 1 addition & 0 deletions packages/python/plotly/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ include README.md
include jupyterlab-plotly.json
include versioneer.py
include plotly/_version.py
include plotly/package_data/widgetbundle.js
4 changes: 2 additions & 2 deletions packages/python/plotly/codegen/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def perform_codegen():
else:
raise ImportError()
except Exception:
from ..missing_ipywidgets import FigureWidget
from ..missing_anywidget import FigureWidget
else:
__all__.append("FigureWidget")
orig_getattr = __getattr__
Expand All @@ -293,7 +293,7 @@ def __getattr__(import_name):
else:
raise ImportError()
except Exception:
from ..missing_ipywidgets import FigureWidget
from ..missing_anywidget import FigureWidget
return FigureWidget

return orig_getattr(import_name)
Expand Down
Loading