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: v7.1.2
Choose a head ref
  • 6 commits
  • 4 files changed
  • 4 contributors

Commits on Jan 21, 2022

  1. Await kernel.ready in _async_shutdown_kernel

    @jtpio
    jtpio committed Jan 21, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    481a2b5 View commit details

  2. Update jupyter_client/multikernelmanager.py

    @Zsailer
    Zsailer authored Jan 21, 2022

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    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

  4. Automated Changelog Entry for 7.1.2 on main

    @github-actions
    github-actions[bot] committed Jan 21, 2022
    Copy the full SHA
    e99a130 View commit details

  5. Merge pull request #741 from jupyter/changelog-8e435c2c7b0a11eca3a90d… 

    …ee7be70f9b

Automated Changelog Entry for 7.1.2 on main
    @Zsailer
    Zsailer authored Jan 21, 2022
    Copy the full SHA
    d1a5754 View commit details

  6. Publish 7.1.2 

    SHA256 hashes:

jupyter_client-7.1.2-py3-none-any.whl: d56f1c57bef42ff31e61b1185d3348a5b2bcde7c9a05523ae4dbe5ee0871797c

jupyter_client-7.1.2.tar.gz: 4ea61033726c8e579edb55626d8ee2e6bf0a83158ddf3751b8dd46b2c5cd1e96
    @github-actions
    github-actions[bot] committed Jan 21, 2022
    Copy the full SHA
    dd54b0b View commit details
Showing with 22 additions and 6 deletions.
  1. +16 −2 CHANGELOG.md
  2. +1 −1 jupyter_client/_version.py
  3. +4 −2 jupyter_client/multikernelmanager.py
  4. +1 −1 pyproject.toml
18 changes: 16 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,22 @@

<!-- <START NEW CHANGELOG ENTRY> -->

## 7.1.2

([Full Changelog](https://github.com/jupyter/jupyter_client/compare/v7.1.1...2c9fbf499f63d4287851021b8f8efc9d3c0e336e))

### Bugs fixed

- Await `kernel.ready` in `_async_shutdown_kernel` [#740](https://github.com/jupyter/jupyter_client/pull/740) ([@jtpio](https://github.com/jtpio))

### Contributors to this release

([GitHub contributors page for this release](https://github.com/jupyter/jupyter_client/graphs/contributors?from=2022-01-14&to=2022-01-21&type=c))

[@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3Ajtpio+updated%3A2022-01-14..2022-01-21&type=Issues) | [@Zsailer](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3AZsailer+updated%3A2022-01-14..2022-01-21&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 7.1.1

([Full Changelog](https://github.com/jupyter/jupyter_client/compare/v7.1.0...4428715b65741ddccac9305d318d4ace08fa711a))
@@ -26,8 +42,6 @@

[@abzymeinsjtu](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3Aabzymeinsjtu+updated%3A2021-11-22..2022-01-14&type=Issues) | [@blink1073](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3Ablink1073+updated%3A2021-11-22..2022-01-14&type=Issues) | [@BoPeng](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3ABoPeng+updated%3A2021-11-22..2022-01-14&type=Issues) | [@davidbrochart](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3Adavidbrochart+updated%3A2021-11-22..2022-01-14&type=Issues) | [@minrk](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3Aminrk+updated%3A2021-11-22..2022-01-14&type=Issues) | [@rgbkrk](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3Argbkrk+updated%3A2021-11-22..2022-01-14&type=Issues) | [@willingc](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3Awillingc+updated%3A2021-11-22..2022-01-14&type=Issues) | [@Zsailer](https://github.com/search?q=repo%3Ajupyter%2Fjupyter_client+involves%3AZsailer+updated%3A2021-11-22..2022-01-14&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 7.1.0

([Full Changelog](https://github.com/jupyter/jupyter_client/compare/v7.0.6...6b76603578fd3a76fd577d3319393c9933f53ab0))
2 changes: 1 addition & 1 deletion jupyter_client/_version.py
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
from typing import List
from typing import Union

__version__ = "7.1.1"
__version__ = "7.1.2"

# Build up version_info tuple for backwards compatibility
pattern = r'(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)'
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ skip = ["check-links"]
ignore = [".mailmap", "*.yml", "*.yaml"]

[tool.tbump.version]
current = "7.1.1"
current = "7.1.2"
regex = '''
(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
((?P<channel>a|b|rc|.dev)(?P<release>\d+))?