Skip to content

Commit 5c16fde

Browse files
committed
Decrease imports reach on wheel build.
Moving _is_debugpy_available to .debugger to avoid having import that much of the package on wheel building. In particular this was forcing `psutil` to be importable to build this package
1 parent 16807bf commit 5c16fde

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

ipykernel/debugger.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,14 @@
1919

2020
from .compiler import (get_file_name, get_tmp_directory, get_tmp_hash_seed)
2121

22-
# This import is required to have the next ones working...
23-
from debugpy.server import api # noqa
24-
from _pydevd_bundle import pydevd_frame_utils
25-
from _pydevd_bundle.pydevd_suspended_frames import SuspendedFramesManager, _FramesTracker
22+
try:
23+
# This import is required to have the next ones working...
24+
from debugpy.server import api # noqa
25+
from _pydevd_bundle import pydevd_frame_utils
26+
from _pydevd_bundle.pydevd_suspended_frames import SuspendedFramesManager, _FramesTracker
27+
_is_debugpy_available = True
28+
except ImportError:
29+
_is_debugpy_available = False
2630

2731
# Required for backwards compatiblity
2832
ROUTING_ID = getattr(zmq, 'ROUTING_ID', None) or zmq.IDENTITY

ipykernel/ipkernel.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from .zmqshell import ZMQInteractiveShell
1919
from .eventloops import _use_appnope
2020
from .compiler import XCachingCompiler
21+
from .debugger import Debugger, _is_debugpy_available
2122

2223
try:
2324
from IPython.core.interactiveshell import _asyncio_runner
@@ -33,12 +34,6 @@
3334
except ImportError:
3435
_use_experimental_60_completion = False
3536

36-
try:
37-
import debugpy
38-
from .debugger import Debugger
39-
_is_debugpy_available = True
40-
except ImportError:
41-
_is_debugpy_available = False
4237

4338
_EXPERIMENTAL_KEY_NAME = '_jupyter_types_experimental'
4439

ipykernel/kernelspec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from jupyter_client.kernelspec import KernelSpecManager
1515

16-
from .ipkernel import _is_debugpy_available
16+
from .debugger import _is_debugpy_available
1717

1818
pjoin = os.path.join
1919

0 commit comments

Comments
 (0)