Skip to content

Commit f870e46

Browse files
authored
Use native kernel by default (#36)
* use native kernel by default * target prereleases
1 parent 84573a1 commit f870e46

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ jobs:
136136
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
137137
with:
138138
package_name: jupyter_server
139+
package_download_extra_args: --pre
139140

140141
jupyter_client_downstream:
141142
runs-on: ubuntu-latest
@@ -146,6 +147,7 @@ jobs:
146147
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
147148
with:
148149
package_name: jupyter_client
150+
package_download_extra_args: --pre
149151

150152
tests_check: # This job does nothing and is only used for the branch protection
151153
if: always()

pytest_jupyter/jupyter_client.py

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

66
try:
77
import ipykernel # noqa
8+
from jupyter_client.kernelspec import NATIVE_KERNEL_NAME
89
from jupyter_client.manager import start_new_async_kernel
910
except ImportError:
1011
import warnings
@@ -35,7 +36,7 @@ def jp_start_kernel(jp_environ, jp_asyncio_loop):
3536
kms = []
3637
kcs = []
3738

38-
async def inner(kernel_name="echo", **kwargs):
39+
async def inner(kernel_name=NATIVE_KERNEL_NAME, **kwargs):
3940
km, kc = await start_new_async_kernel(kernel_name=kernel_name, **kwargs)
4041
kms.append(km)
4142
kcs.append(kc)

pytest_jupyter/jupyter_server.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,6 @@ def _configurable_serverapp(
205205
c = Config(config)
206206
c.NotebookNotary.db_file = ":memory:"
207207

208-
if "default_kernel_name" not in c.MultiKernelManager:
209-
c.MultiKernelManager.default_kernel_name = "echo"
210-
211208
default_token = hexlify(os.urandom(4)).decode("ascii")
212209
if not is_v2:
213210
kwargs["token"] = default_token

tests/test_jupyter_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ def test_zmq_context(jp_zmq_context):
1010

1111

1212
async def test_start_kernel(jp_start_kernel):
13-
km, kc = await jp_start_kernel()
13+
km, kc = await jp_start_kernel("echo")
1414
assert km.kernel_name == "echo"
1515
msg = await kc.execute("hello", reply=True)
1616
assert msg["content"]["status"] == "ok"
1717

18-
km, kc = await jp_start_kernel("python3")
18+
km, kc = await jp_start_kernel()
1919
assert km.kernel_name == "python3"
2020
msg = await kc.execute("print('hi')", reply=True)
2121
assert msg["content"]["status"] == "ok"

0 commit comments

Comments
 (0)