From e3b3ac977497dae3c72454d853822725d49f4fc2 Mon Sep 17 00:00:00 2001 From: Ed Rogers Date: Sat, 21 Jun 2025 15:01:57 -0500 Subject: [PATCH 1/6] Use stdlib override when possible --- jupyter_server/services/kernels/kernelmanager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jupyter_server/services/kernels/kernelmanager.py b/jupyter_server/services/kernels/kernelmanager.py index 3b31b64cc6..c172f179e3 100644 --- a/jupyter_server/services/kernels/kernelmanager.py +++ b/jupyter_server/services/kernels/kernelmanager.py @@ -24,7 +24,11 @@ from jupyter_core.utils import ensure_async from jupyter_events import EventLogger from jupyter_events.schema_registry import SchemaRegistryException -from overrides import overrides + +try: + from typing import override as overrides +except ImportError: + from overrides import overrides from tornado import web from tornado.concurrent import Future from tornado.ioloop import IOLoop, PeriodicCallback From ed62679b7a674739a19ec8c1fc7a0817e8d6db8e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 21 Jun 2025 21:09:29 +0000 Subject: [PATCH 2/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 995919121c..cd99103896 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. ### Enhancements made -- If ServerApp.ip is ipv6 use [::1] as local_url [#1495](https://github.com/jupyter-server/jupyter_server/pull/1495) ([@manics](https://github.com/manics)) +- If ServerApp.ip is ipv6 use \[::1\] as local_url [#1495](https://github.com/jupyter-server/jupyter_server/pull/1495) ([@manics](https://github.com/manics)) - Don't hide .so,.dylib files by default [#1457](https://github.com/jupyter-server/jupyter_server/pull/1457) ([@nokados](https://github.com/nokados)) - Add async start hook to ExtensionApp API [#1417](https://github.com/jupyter-server/jupyter_server/pull/1417) ([@Zsailer](https://github.com/Zsailer)) From e610ce7198a482090334bb45fcd97c27fd3d1292 Mon Sep 17 00:00:00 2001 From: Ed Rogers Date: Thu, 26 Jun 2025 10:43:57 -0500 Subject: [PATCH 3/6] Dispatch off sys.version_info --- jupyter_server/services/kernels/kernelmanager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jupyter_server/services/kernels/kernelmanager.py b/jupyter_server/services/kernels/kernelmanager.py index c172f179e3..51eb1d7770 100644 --- a/jupyter_server/services/kernels/kernelmanager.py +++ b/jupyter_server/services/kernels/kernelmanager.py @@ -11,6 +11,7 @@ import asyncio import os import pathlib # noqa: TCH003 +import sys import typing as t import warnings from collections import defaultdict @@ -25,9 +26,9 @@ from jupyter_events import EventLogger from jupyter_events.schema_registry import SchemaRegistryException -try: +if sys.version_info >= (3, 12): from typing import override as overrides -except ImportError: +else: from overrides import overrides from tornado import web from tornado.concurrent import Future From 3b362c5648eecf59e6a80eaba1d24017de6b5a05 Mon Sep 17 00:00:00 2001 From: Ed Rogers Date: Thu, 26 Jun 2025 10:49:25 -0500 Subject: [PATCH 4/6] Add PEP508 selector to the overrides dependency --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e04983380d..eb2a0ed58c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ "traitlets>=5.6.0", "websocket-client>=1.7", "jupyter_events>=0.11.0", - "overrides>=5.0" + "overrides>=5.0;python_version<'3.12'" ] [project.urls] From 056ac17ac7b51e37488ae0a47a8996feecd886f8 Mon Sep 17 00:00:00 2001 From: Ed Rogers Date: Thu, 26 Jun 2025 10:51:29 -0500 Subject: [PATCH 5/6] Follow stdlib naming convention: override instead of overrides --- jupyter_server/services/kernels/kernelmanager.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jupyter_server/services/kernels/kernelmanager.py b/jupyter_server/services/kernels/kernelmanager.py index 51eb1d7770..8f4e8277f9 100644 --- a/jupyter_server/services/kernels/kernelmanager.py +++ b/jupyter_server/services/kernels/kernelmanager.py @@ -27,9 +27,9 @@ from jupyter_events.schema_registry import SchemaRegistryException if sys.version_info >= (3, 12): - from typing import override as overrides + from typing import override else: - from overrides import overrides + from overrides import overrides as override from tornado import web from tornado.concurrent import Future from tornado.ioloop import IOLoop, PeriodicCallback @@ -899,28 +899,28 @@ def emit(self, schema_id, data): """Emit an event from the kernel manager.""" self.event_logger.emit(schema_id=schema_id, data=data) - @overrides + @override @emit_kernel_action_event( success_msg="Kernel {kernel_id} was started.", ) async def start_kernel(self, *args, **kwargs): return await super().start_kernel(*args, **kwargs) - @overrides + @override @emit_kernel_action_event( success_msg="Kernel {kernel_id} was shutdown.", ) async def shutdown_kernel(self, *args, **kwargs): return await super().shutdown_kernel(*args, **kwargs) - @overrides + @override @emit_kernel_action_event( success_msg="Kernel {kernel_id} was restarted.", ) async def restart_kernel(self, *args, **kwargs): return await super().restart_kernel(*args, **kwargs) - @overrides + @override @emit_kernel_action_event( success_msg="Kernel {kernel_id} was interrupted.", ) From e5700b195d6de580bc799bb4c302998d3d771ae5 Mon Sep 17 00:00:00 2001 From: Ed Rogers Date: Thu, 24 Jul 2025 10:17:00 -0500 Subject: [PATCH 6/6] Empty commit to trigger CI