##// END OF EJS Templates
Move protocol_version to core.release
Takafumi Arakaki -
Show More
@@ -38,6 +38,9 b" __version__ = '.'.join(map(str, _ver))"
38 version = __version__ # backwards compatibility name
38 version = __version__ # backwards compatibility name
39 version_info = (_version_major, _version_minor, _version_micro, _version_extra)
39 version_info = (_version_major, _version_minor, _version_micro, _version_extra)
40
40
41 # Change this when incrementing the kernel protocol version
42 kernel_protocol_version_info = (4, 0)
43
41 description = "IPython: Productive Interactive Computing"
44 description = "IPython: Productive Interactive Computing"
42
45
43 long_description = \
46 long_description = \
@@ -35,11 +35,11 b' from zmq.eventloop import ioloop'
35 from zmq.eventloop.zmqstream import ZMQStream
35 from zmq.eventloop.zmqstream import ZMQStream
36
36
37 # Local imports
37 # Local imports
38 import IPython
39 from IPython.config.configurable import Configurable
38 from IPython.config.configurable import Configurable
40 from IPython.config.application import boolean_flag, catch_config_error
39 from IPython.config.application import boolean_flag, catch_config_error
41 from IPython.core.application import ProfileDir
40 from IPython.core.application import ProfileDir
42 from IPython.core.error import StdinNotImplementedError
41 from IPython.core.error import StdinNotImplementedError
42 from IPython.core import release
43 from IPython.core.shellapp import (
43 from IPython.core.shellapp import (
44 InteractiveShellApp, shell_flags, shell_aliases
44 InteractiveShellApp, shell_flags, shell_aliases
45 )
45 )
@@ -54,7 +54,7 b' from IPython.utils.traitlets import ('
54 from entry_point import base_launch_kernel
54 from entry_point import base_launch_kernel
55 from kernelapp import KernelApp, kernel_flags, kernel_aliases
55 from kernelapp import KernelApp, kernel_flags, kernel_aliases
56 from serialize import serialize_object, unpack_apply_message
56 from serialize import serialize_object, unpack_apply_message
57 from session import Session, Message, protocol_version
57 from session import Session, Message
58 from zmqshell import ZMQInteractiveShell
58 from zmqshell import ZMQInteractiveShell
59
59
60
60
@@ -62,7 +62,8 b' from zmqshell import ZMQInteractiveShell'
62 # Main kernel class
62 # Main kernel class
63 #-----------------------------------------------------------------------------
63 #-----------------------------------------------------------------------------
64
64
65 ipython_version = list(IPython.version_info)
65 protocol_version = list(release.kernel_protocol_version_info)
66 ipython_version = list(release.version_info)
66 language_version = list(sys.version_info[:3])
67 language_version = list(sys.version_info[:3])
67
68
68
69
@@ -74,9 +74,6 b' def squash_unicode(obj):'
74 # globals and defaults
74 # globals and defaults
75 #-----------------------------------------------------------------------------
75 #-----------------------------------------------------------------------------
76
76
77 # Change this when incrementing the kernel protocol version
78 protocol_version = [4, 0]
79
80 # ISO8601-ify datetime objects
77 # ISO8601-ify datetime objects
81 json_packer = lambda obj: jsonapi.dumps(obj, default=date_default)
78 json_packer = lambda obj: jsonapi.dumps(obj, default=date_default)
82 json_unpacker = lambda s: extract_dates(jsonapi.loads(s))
79 json_unpacker = lambda s: extract_dates(jsonapi.loads(s))
General Comments 0
You need to be logged in to leave comments. Login now