Skip to content

Commit 407b2d6

Browse files
committed
Merge pull request #62 from minrk/kernel_protocol_version
Don't get kernel_protocol_version from IPython
2 parents 62b18d1 + 7de578d commit 407b2d6

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

ipykernel/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
from ._version import version_info, __version__
1+
from ._version import *
22
from .connect import *

ipykernel/_version.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
version_info = (4, 1, 0, 'dev')
22
__version__ = '.'.join(map(str, version_info))
3+
4+
kernel_protocol_version_info = (5, 0)
5+
kernel_protocol_version = '%s.%s' % kernel_protocol_version_info

ipykernel/kernelbase.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
from traitlets.config.configurable import SingletonConfigurable
2323
from IPython.core.error import StdinNotImplementedError
24-
from IPython.core import release
2524
from ipython_genutils import py3compat
2625
from ipython_genutils.py3compat import unicode_type, string_types
2726
from ipykernel.jsonutil import json_clean
@@ -31,6 +30,7 @@
3130

3231
from jupyter_client.session import Session
3332

33+
from ._version import kernel_protocol_version
3434

3535
class Kernel(SingletonConfigurable):
3636

@@ -465,7 +465,7 @@ def connect_request(self, stream, ident, parent):
465465
@property
466466
def kernel_info(self):
467467
return {
468-
'protocol_version': release.kernel_protocol_version,
468+
'protocol_version': kernel_protocol_version,
469469
'implementation': self.implementation,
470470
'implementation_version': self.implementation_version,
471471
'language_info': self.language_info,

0 commit comments

Comments
 (0)