Skip to content

Commit e9cae19

Browse files
committed
Compatibility fixes for python3.11 and ci running.
1 parent 491ec54 commit e9cae19

File tree

8 files changed

+16
-10
lines changed

8 files changed

+16
-10
lines changed

src/async_kernel/__main__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ def main(wait_exit_context=anyio.sleep_forever):
3636
help=f"Add a kernel spec. Default kernels: {list(map(str, KernelName))}.\n"
3737
+ "Other kernels and options are permitted. See: `write_kernel_spec` for detail.",
3838
)
39+
kernels = [] if not kernel_dir.exists() else [item.name for item in kernel_dir.iterdir() if item.is_dir()]
3940
parser.add_argument(
4041
"-r",
4142
"--remove",
4243
dest="remove",
43-
help=f"remove existing kernel specs. Installed kernels: {[item.name for item in kernel_dir.iterdir() if item.is_dir()]}",
44+
help=f"remove existing kernel specs. Installed kernels: {kernels}",
4445
)
4546

4647
args, unknownargs = parser.parse_known_args()

src/async_kernel/caller.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
import weakref
1414
from collections import deque
1515
from collections.abc import AsyncGenerator, Awaitable, Callable, Generator
16-
from typing import TYPE_CHECKING, Any, ClassVar, Literal, Self, cast, override
16+
from typing import TYPE_CHECKING, Any, ClassVar, Literal, Self, cast
1717

1818
import anyio
1919
import sniffio
20+
from typing_extensions import override
2021
from zmq import Context, Socket, SocketType
2122

2223
from async_kernel.typing import NoValue, T

src/async_kernel/compiler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import os
99
import pathlib
1010
import tempfile
11-
from typing import ClassVar, override
11+
from typing import ClassVar
1212

1313
from IPython.core.compilerop import CachingCompiler
14+
from typing_extensions import override
1415

1516
__all__ = ["XCachingCompiler", "murmur2_x86"]
1617

src/async_kernel/iostream.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55

66
from io import TextIOBase
77
from threading import Lock
8-
from typing import TYPE_CHECKING, override
8+
from typing import TYPE_CHECKING
9+
10+
from typing_extensions import override
911

1012
if TYPE_CHECKING:
1113
from collections.abc import Callable

src/async_kernel/kernel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ def get_execute_mode(job: Job[ExecuteContent]) -> ExecuteMode:
435435
if m := job["msg"]["content"].get("execute_mode"):
436436
# Respect an existing mode
437437
return ExecuteMode(m)
438-
if (c := job["msg"]["content"]["code"].strip().split("\n")[0].strip()) in ExecuteMode:
438+
if (c := job["msg"]["content"]["code"].strip().split("\n")[0].strip()) in iter(ExecuteMode):
439439
mode = ExecuteMode(c)
440440
else:
441441
mode = ExecuteMode.queue

tests/references.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
import re
99
import sys
10-
from typing import override
1110

1211
from packaging.version import Version as PackingVersion
1312
from traitlets import Bool, Dict, Enum, HasTraits, Integer, List, TraitError, Unicode, observe
13+
from typing_extensions import override
1414

1515
__all__ = ["Reference", "references"]
1616

tests/test_kernelspec.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
@pytest.mark.parametrize("kernel_name", list(KernelName))
1515
def test_write_kernel_spec(kernel_name: KernelName):
1616
path = write_kernel_spec(kernel_name=kernel_name)
17-
for fname in RESOURCES.iterdir():
18-
dst = path.joinpath(fname)
19-
assert pathlib.Path(dst).exists()
17+
if RESOURCES.exists():
18+
for fname in RESOURCES.iterdir():
19+
dst = path.joinpath(fname)
20+
assert pathlib.Path(dst).exists()
2021
kernel_json = path.joinpath("kernel.json")
2122
assert kernel_json.exists()
2223
with kernel_json.open("r") as f:

tests/test_start_in_context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def anyio_backend(kernel_name: KernelName):
2828

2929
async def test_start_kernel_in_context(anyio_backend, kernel_name):
3030
utils.clear_kernel()
31-
if kernel_name is KernelName.asyncio_eager:
31+
if kernel_name == "async-eager":
3232
loop = asyncio.get_running_loop()
3333
loop.set_task_factory(asyncio.eager_task_factory)
3434
try:

0 commit comments

Comments
 (0)