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: ipython/ipykernel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.23.2
Choose a base ref
...
head repository: ipython/ipykernel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.23.3
Choose a head ref
  • 2 commits
  • 6 files changed
  • 3 contributors

Commits on Jun 23, 2023

  1. fix: check existence of connection_file before writing (#1127) 

    Co-authored-by: Steven Silvester <steven.silvester@ieee.org>
    @fecet @blink1073
    fecet and blink1073 authored Jun 23, 2023

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    ea3e647 View commit details

  2. Publish 6.23.3 

    SHA256 hashes:

ipykernel-6.23.3-py3-none-any.whl: bc00662dc44d4975b668cdb5fefb725e38e9d8d6e28441a519d043f38994922d

ipykernel-6.23.3.tar.gz: dd4e18116357f36a1e459b3768412371bee764c51844cbf25c4ed1eb9cae4a54
    @blink1073
    blink1073 committed Jun 23, 2023

    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
    99b2ec4 View commit details
Showing with 26 additions and 6 deletions.
  1. +16 −2 CHANGELOG.md
  2. +1 −1 ipykernel/_version.py
  3. +1 −1 ipykernel/eventloops.py
  4. +3 −0 ipykernel/inprocess/tests/test_kernelmanager.py
  5. +3 −0 ipykernel/kernelapp.py
  6. +2 −2 ipykernel/tests/test_debugger.py
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> -->

## 6.23.3

([Full Changelog](https://github.com/ipython/ipykernel/compare/v6.23.2...ea3e6479aca70f87282ec0b60412f2cfba59eb35))

### Bugs fixed

- Check existence of connection_file before writing [#1127](https://github.com/ipython/ipykernel/pull/1127) ([@fecet](https://github.com/fecet))

### Contributors to this release

([GitHub contributors page for this release](https://github.com/ipython/ipykernel/graphs/contributors?from=2023-06-12&to=2023-06-23&type=c))

[@blink1073](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Ablink1073+updated%3A2023-06-12..2023-06-23&type=Issues) | [@fecet](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Afecet+updated%3A2023-06-12..2023-06-23&type=Issues)

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

## 6.23.2

([Full Changelog](https://github.com/ipython/ipykernel/compare/v6.23.1...112ca66da0ee8156b983094b2c8e2926ed63cfcb))
@@ -19,8 +35,6 @@

[@charles-cooper](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Acharles-cooper+updated%3A2023-05-15..2023-06-12&type=Issues) | [@minrk](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Aminrk+updated%3A2023-05-15..2023-06-12&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Apre-commit-ci+updated%3A2023-05-15..2023-06-12&type=Issues)

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

## 6.23.1

([Full Changelog](https://github.com/ipython/ipykernel/compare/v6.23.0...d63c33afb9872f2781997b2428d7e9e0c1d23d41))
2 changes: 1 addition & 1 deletion ipykernel/_version.py
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
from typing import List

# Version string must appear intact for hatch versioning
__version__ = "6.23.2"
__version__ = "6.23.3"

# Build up version_info tuple for backwards compatibility
pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"
2 changes: 1 addition & 1 deletion ipykernel/eventloops.py
View file
Original file line number Diff line number Diff line change
@@ -429,7 +429,7 @@ async def close_loop():
close_loop()

elif not loop.is_closed():
loop.run_until_complete(close_loop) # type:ignore[call-overload]
loop.run_until_complete(close_loop) # type:ignore
loop.close()


3 changes: 3 additions & 0 deletions ipykernel/inprocess/tests/test_kernelmanager.py
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@

import unittest

from flaky import flaky

from ipykernel.inprocess.manager import InProcessKernelManager

# -----------------------------------------------------------------------------
@@ -18,6 +20,7 @@ def tearDown(self):
if self.km.has_kernel:
self.km.shutdown_kernel()

@flaky
def test_interface(self):
"""Does the in-process kernel manager implement the basic KM interface?"""
km = self.km
3 changes: 3 additions & 0 deletions ipykernel/kernelapp.py
View file
Original file line number Diff line number Diff line change
@@ -260,6 +260,9 @@ def _bind_socket(self, s, port):
def write_connection_file(self):
"""write connection info to JSON file"""
cf = self.abs_connection_file
if os.path.exists(cf):
self.log.debug("Connection file %s already exists", cf)
return
self.log.debug("Writing connection file: %s", cf)
write_connection_file(
cf,
4 changes: 2 additions & 2 deletions ipykernel/tests/test_debugger.py
View file
Original file line number Diff line number Diff line change
@@ -121,7 +121,7 @@ def test_set_breakpoints(kernel_with_debug):
assert reply["body"]["breakpoints"][0]["source"]["path"] == source

r = wait_for_debug_request(kernel_with_debug, "debugInfo")
assert source in map(lambda b: b["source"], r["body"]["breakpoints"]) # type:ignore # noqa
assert source in map(lambda b: b["source"], r["body"]["breakpoints"]) # noqa

r = wait_for_debug_request(kernel_with_debug, "configurationDone")
assert r["success"]
@@ -208,7 +208,7 @@ def test_rich_inspect_not_at_breakpoint(kernel_with_debug):
get_reply(kernel_with_debug, msg_id)

r = wait_for_debug_request(kernel_with_debug, "inspectVariables")
assert var_name in list(map(lambda v: v["name"], r["body"]["variables"])) # type:ignore # noqa
assert var_name in list(map(lambda v: v["name"], r["body"]["variables"])) # noqa

reply = wait_for_debug_request(
kernel_with_debug,