Skip to content

Commit 80ef4c3

Browse files
committed
Merge branch 'synchronous_managers' of github.com:blink1073/jupyter_client into synchronous_managers
2 parents 293e159 + dfbcd7e commit 80ef4c3

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

jupyter_client/threaded.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from .session import Session
2121
from jupyter_client import KernelClient
2222
from jupyter_client.channels import HBChannel
23-
from jupyter_client.utils import run_sync
2423

2524
# Local imports
2625
# import ZMQError in top-level namespace, to avoid ugly attribute-error messages
@@ -102,7 +101,7 @@ def send(self, msg: Dict[str, Any]) -> None:
102101

103102
def thread_send():
104103
assert self.session is not None
105-
run_sync(self.session.send(self.stream, msg))
104+
self.session.send(self.stream, msg)
106105

107106
assert self.ioloop is not None
108107
self.ioloop.add_callback(thread_send)

tests/test_multikernelmanager.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,10 @@ def test_start_parallel_thread_kernels(self):
178178
(sys.platform == "darwin") and (sys.version_info >= (3, 6)) and (sys.version_info < (3, 8)),
179179
reason='"Bad file descriptor" error',
180180
)
181+
@pytest.mark.skipif(
182+
sys.platform == "linux",
183+
reason='Kernel refuses to start in process pool',
184+
)
181185
def test_start_parallel_process_kernels(self):
182186
self.test_tcp_lifecycle()
183187

0 commit comments

Comments
 (0)