Skip to content

Commit b081590

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents c4a6207 + 06c9aee commit b081590

File tree

7 files changed

+37
-10
lines changed

7 files changed

+37
-10
lines changed

CHANGELOG.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,35 @@
22

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

5+
## 7.2.0a1
6+
7+
([Full Changelog](https://github.com/ipython/ipykernel/compare/v7.2.0a0...220a3c6e8b24ffb3f8678925712ff3644aafb41e))
8+
9+
### New features added
10+
11+
- Added kernel_protocol_version to kernelspec [#1483](https://github.com/ipython/ipykernel/pull/1483) ([@JohanMabille](https://github.com/JohanMabille), [@ianthomas23](https://github.com/ianthomas23))
12+
13+
### Enhancements made
14+
15+
- Made IOPubThread constructor backward compatible [#1492](https://github.com/ipython/ipykernel/pull/1492) ([@JohanMabille](https://github.com/JohanMabille), [@SylvainCorlay](https://github.com/SylvainCorlay), [@ianthomas23](https://github.com/ianthomas23))
16+
- Advertizes kernel protocol 5.5 [#1488](https://github.com/ipython/ipykernel/pull/1488) ([@JohanMabille](https://github.com/JohanMabille), [@ianthomas23](https://github.com/ianthomas23))
17+
- Upgrade to jupyter_client 8.8.0 [#1487](https://github.com/ipython/ipykernel/pull/1487) ([@JohanMabille](https://github.com/JohanMabille), [@ianthomas23](https://github.com/ianthomas23))
18+
19+
### Maintenance and upkeep improvements
20+
21+
- Update pytest requirement from \<9,>=7.0 to >=7.0,\<10 in the actions group across 1 directory [#1489](https://github.com/ipython/ipykernel/pull/1489) ([@JohanMabille](https://github.com/JohanMabille))
22+
23+
### Contributors to this release
24+
25+
The following people contributed discussions, new ideas, code and documentation contributions, and review.
26+
See [our definition of contributors](https://github-activity.readthedocs.io/en/latest/use/#how-does-this-tool-define-contributions-in-the-reports).
27+
28+
([GitHub contributors page for this release](https://github.com/ipython/ipykernel/graphs/contributors?from=2026-01-08&to=2026-01-30&type=c))
29+
30+
@ianthomas23 ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Aianthomas23+updated%3A2026-01-08..2026-01-30&type=Issues)) | @JohanMabille ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3AJohanMabille+updated%3A2026-01-08..2026-01-30&type=Issues)) | @SylvainCorlay ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3ASylvainCorlay+updated%3A2026-01-08..2026-01-30&type=Issues))
31+
32+
<!-- <END NEW CHANGELOG ENTRY> -->
33+
534
## 7.2.0a0
635

736
([Full Changelog](https://github.com/ipython/ipykernel/compare/v7.1.0...6786ddd040c1f0e8aaeae7e261eec511e2a37fd9))
@@ -36,8 +65,6 @@ See [our definition of contributors](https://github-activity.readthedocs.io/en/l
3665

3766
@arjxn-py ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Aarjxn-py+updated%3A2025-10-27..2026-01-08&type=Issues)) | @Carreau ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3ACarreau+updated%3A2025-10-27..2026-01-08&type=Issues)) | @ianthomas23 ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Aianthomas23+updated%3A2025-10-27..2026-01-08&type=Issues)) | @JohanMabille ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3AJohanMabille+updated%3A2025-10-27..2026-01-08&type=Issues)) | @newville ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3Anewville+updated%3A2025-10-27..2026-01-08&type=Issues)) | @SylvainCorlay ([activity](https://github.com/search?q=repo%3Aipython%2Fipykernel+involves%3ASylvainCorlay+updated%3A2025-10-27..2026-01-08&type=Issues))
3867

39-
<!-- <END NEW CHANGELOG ENTRY> -->
40-
4168
## 7.1.0
4269

4370
IPykernel 7.1.0 fixes an issue where display outputs such as Matplotlib plots were not included when using `%notebook` magic to save sessions as `.ipynb` files (#1435). This is enabled using the traitlet `ZMQDisplayPublisher.store_display_history` which defaults to the previous behaviour of False. This is a minor release rather than a patch release due to the addition of the new traitlet.

ipykernel/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import re
66

77
# Version string must appear intact for hatch versioning
8-
__version__ = "7.2.0a0"
8+
__version__ = "7.2.0a1"
99

1010
# Build up version_info tuple for backwards compatibility
1111
pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"

ipykernel/inprocess/ipkernel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class InProcessKernel(IPythonKernel):
5656

5757
@default("iopub_thread")
5858
def _default_iopub_thread(self):
59-
thread = IOPubThread(self._underlying_iopub_socket, self.session)
59+
thread = IOPubThread(self._underlying_iopub_socket, session=self.session)
6060
thread.start()
6161
return thread
6262

ipykernel/iostream.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class IOPubThread:
4747
whose IO is always run in a thread.
4848
"""
4949

50-
def __init__(self, socket, session=None, pipe=False):
50+
def __init__(self, socket, pipe=False, session=False):
5151
"""Create IOPub thread
5252
5353
Parameters
@@ -518,7 +518,7 @@ def __init__(
518518
DeprecationWarning,
519519
stacklevel=2,
520520
)
521-
pub_thread = IOPubThread(pub_thread, self.session)
521+
pub_thread = IOPubThread(pub_thread, session=self.session)
522522
pub_thread.start()
523523
self.pub_thread = pub_thread
524524
self.name = name

ipykernel/kernelapp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ def init_iopub(self, context):
382382
self.iopub_port = self._bind_socket(self.iopub_socket, self.iopub_port)
383383
self.log.debug("iopub PUB Channel on port: %i", self.iopub_port)
384384
self.configure_tornado_logger()
385-
self.iopub_thread = IOPubThread(self.iopub_socket, self.session, pipe=True)
385+
self.iopub_thread = IOPubThread(self.iopub_socket, pipe=True, session=self.session)
386386
self.iopub_thread.start()
387387
# backward-compat: wrap iopub socket API in background thread
388388
self.iopub_socket = self.iopub_thread.background_socket

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ docs = [
5555
"trio"
5656
]
5757
test = [
58-
"pytest>=7.0,<9",
58+
"pytest>=7.0,<10",
5959
"pytest-cov",
6060
# 'pytest-xvfb; platform_system == "Linux"',
6161
"flaky",

tests/test_io.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def ctx():
2828
def iopub_thread(ctx):
2929
session = Session()
3030
with ctx.socket(zmq.PUB) as pub:
31-
thread = IOPubThread(pub, session)
31+
thread = IOPubThread(pub, session=session)
3232
thread.start()
3333

3434
yield thread
@@ -156,7 +156,7 @@ def subprocess_test_echo_watch():
156156
# use PUSH socket to avoid subscription issues
157157
with zmq.Context() as ctx, ctx.socket(zmq.PUSH) as pub:
158158
pub.connect(os.environ["IOPUB_URL"])
159-
iopub_thread = IOPubThread(pub, session)
159+
iopub_thread = IOPubThread(pub, session=session)
160160
iopub_thread.start()
161161
stdout_fd = sys.stdout.fileno()
162162
sys.stdout.flush()

0 commit comments

Comments
 (0)