Skip to content

Commit 3a2fb0e

Browse files
committed
Replace ipykernel dependency by the comm dependency
1 parent 39d3c5d commit 3a2fb0e

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

python/ipywidgets/ipywidgets/__init__.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,21 @@
2121
from ._version import __version__, __protocol_version__, __jupyter_widgets_controls_version__, __jupyter_widgets_base_version__
2222

2323
import os
24+
import sys
2425

2526
from traitlets import link, dlink
2627
from IPython import get_ipython
27-
try:
28-
from comm import get_comm_manager
29-
except ImportError:
28+
29+
# Using the comm implementation through ipykernel if available
30+
if "ipykernel" in sys.modules:
3031
def get_comm_manager():
3132
ip = get_ipython()
3233

3334
if ip is not None and getattr(ip, "kernel", None) is not None:
3435
return get_ipython().kernel.comm_manager
36+
# Using the comm package
37+
else:
38+
from comm import get_comm_manager
3539

3640
from .widgets import *
3741

python/ipywidgets/ipywidgets/widgets/widget.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
in the Jupyter notebook front-end.
77
"""
88
import os
9+
import sys
910
import typing
1011
from contextlib import contextmanager
1112
from collections.abc import Iterable
@@ -524,13 +525,13 @@ def open(self):
524525
if self._model_id is not None:
525526
args['comm_id'] = self._model_id
526527

527-
try:
528-
from comm import create_comm
529-
except ImportError:
528+
if "ipykernel" in sys.modules:
530529
def create_comm(**kwargs):
531530
from ipykernel.comm import Comm
532531

533532
return Comm(**kwargs)
533+
else:
534+
from comm import create_comm
534535

535536
self.comm = create_comm(**args)
536537

python/ipywidgets/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ zip_safe = False
3434
packages = find:
3535

3636
install_requires =
37-
ipykernel>=4.5.1
37+
comm>=0.1.3
3838
ipython>=6.1.0
3939
traitlets>=4.3.1
4040
widgetsnbextension~=4.0.7

0 commit comments

Comments
 (0)