Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jupyter/jupyter_client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.1.1
Choose a base ref
...
head repository: jupyter/jupyter_client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c9fbf499f63d4287851021b8f8efc9d3c0e336e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Jan 21, 2022

  1. Await kernel.ready in _async_shutdown_kernel

    @jtpio
    jtpio committed Jan 21, 2022
    Copy the full SHA
    481a2b5 View commit details

  2. Update jupyter_client/multikernelmanager.py

    @Zsailer
    Zsailer authored Jan 21, 2022
    Copy the full SHA
    bf08cde View commit details

  3. Merge pull request #740 from jtpio/await-kernel-ready

    @blink1073
    blink1073 authored Jan 21, 2022
    Copy the full SHA
    2c9fbf4 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 jupyter_client/multikernelmanager.py
6 changes: 4 additions & 2 deletions jupyter_client/multikernelmanager.py
View file
Original file line number Diff line number Diff line change
@@ -260,10 +260,12 @@ async def _async_shutdown_kernel(
if self._using_pending_kernels() and kernel_id in self._pending_kernels:
raise RuntimeError("Kernel is in a pending state. Cannot shutdown.")
# If the kernel is still starting, wait for it to be ready.
elif kernel_id in self._starting_kernels:
kernel = self._starting_kernels[kernel_id]
elif kernel_id in self._pending_kernels:
kernel = self._pending_kernels[kernel_id]
try:
await kernel
km = self.get_kernel(kernel_id)
await km.ready
except Exception:
self.remove_kernel(kernel_id)
return