Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use jupyter_client's AsyncKernelManager #191

Merged
merged 37 commits into from
Apr 4, 2020
Merged

Use jupyter_client's AsyncKernelManager #191

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
5cba6d8
Use jupyter_client's AsyncKernelManager
davidbrochart Mar 16, 2020
104b9f1
Rename MappingKernelManage to AsyncMappingKernelManage, convert gen.c…
davidbrochart Mar 16, 2020
cc55f28
Fix Windows subprocess handle issue
davidbrochart Mar 16, 2020
c659e16
Restrict Windows to python>=3.7
davidbrochart Mar 17, 2020
657ab1e
Fix GH actions matrix exclusion
davidbrochart Mar 17, 2020
3b63be1
Again
davidbrochart Mar 17, 2020
fbd6b91
Make AsyncMappingKernelManager a subclass of MappingKernelManager for…
davidbrochart Mar 18, 2020
904aae3
Make AsyncKernelManager an opt-in
davidbrochart Mar 20, 2020
424ae3e
Pin jupyter_client>=6.1.0
davidbrochart Mar 20, 2020
655d31a
Pin jupyter_client>=5.3.1
davidbrochart Mar 23, 2020
90e4af4
Pin jupyter_core and jupyter_client a bit higher
davidbrochart Mar 23, 2020
37819bf
Remove async from MappingKernelManager.shutdown_kernel
davidbrochart Mar 24, 2020
89989bc
Hard-code super() in MappingKernelManager and AsyncMappingKernelManager
davidbrochart Mar 24, 2020
367f228
Add argv fixture to enable MappingKernelManager and AsyncMappingKerne…
davidbrochart Mar 24, 2020
1f1009b
Rewrite ensure_async to not await already awaited coroutines
davidbrochart Mar 24, 2020
abf90a7
Add async shutdown_kernel to AsyncMappingKernelManager, keep MappingK…
davidbrochart Mar 25, 2020
aee2a8c
Add restart kwarg to shutdown_kernel
davidbrochart Mar 25, 2020
8bd6d3e
Add log message when starting (async) kernel manager
davidbrochart Mar 25, 2020
a2610d3
Bump jupyter_client 6.1.1
davidbrochart Mar 25, 2020
67b2560
Rename super attribute to pinned_superclass
davidbrochart Mar 31, 2020
d80994d
Again
davidbrochart Mar 31, 2020
799e5ff
Prevent using AsyncMappingKernelManager on python<=3.5 (at run-time a…
davidbrochart Apr 1, 2020
e24faca
Import sys
davidbrochart Apr 1, 2020
eee6e1d
Update comment
davidbrochart Apr 1, 2020
cdf53ee
Ignore last_activity and execution_state when comparing sessions
davidbrochart Apr 1, 2020
9ad005e
Replace newsession with new_session
davidbrochart Apr 1, 2020
93a0c7a
Fix Python version check
davidbrochart Apr 2, 2020
54656de
Skip gateway tests if python<3.6
davidbrochart Apr 2, 2020
11f3ccf
Fix skipping of tests
davidbrochart Apr 2, 2020
6691718
Again
davidbrochart Apr 2, 2020
1a6fe32
GatewayKernelManager inherits from MappingKernelManager to keep pytho…
davidbrochart Apr 2, 2020
40d017e
Added back removal of kernelmanager.AsyncMappingKernelManager
davidbrochart Apr 2, 2020
ba4dd16
-
davidbrochart Apr 2, 2020
d5d0a0d
-
davidbrochart Apr 2, 2020
16a7835
:-)
davidbrochart Apr 2, 2020
530b6ce
:-[
davidbrochart Apr 2, 2020
082075a
Don't test absence of AsyncMultiKernelManager
davidbrochart Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/services/kernels/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,8 @@ def no_async_mapping_kernel_manager(monkeypatch):


@pytest.mark.skipif(
sys.version_info >= (3, 6)
sys.version_info >= (3, 6),
reason="Testing no AsyncMappingKernelManager on Python <=3.5"
)
async def test_async_kernel_manager_not_available_py35(configurable_serverapp, no_async_multi_kernel_manager):
argv = ['--ServerApp.kernel_manager_class=jupyter_server.services.kernels.kernelmanager.AsyncMappingKernelManager']
Expand All @@ -284,7 +285,7 @@ async def test_async_kernel_manager_not_available_py35(configurable_serverapp, n

@pytest.mark.skipif(
sys.version_info < (3, 6),
reason="Kernel manager is AsyncMappingKernelManager, Python version < 3.6"
reason="Testing no AsyncMappingKernelManager on Python >=3.6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need trailing quotes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

)
async def test_async_kernel_manager_not_available_py36plus(configurable_serverapp, no_async_multi_kernel_manager, no_async_mapping_kernel_manager):
argv = ['--ServerApp.kernel_manager_class=jupyter_server.services.kernels.kernelmanager.AsyncMappingKernelManager']
Expand Down