hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-05 07:41:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add customizable jupyter-runtime-directory variable

Browse source 
- Also fix the handling of `resource_dir` in a kernelspec argument vector
This commit is contained in:
Nathaniel Nicandro 2018-01-18 22:45:17 -06:00
parent f27fad472b
commit de635fdc3a
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
jupyter-base.el
View file

@ -36,6 +36,15 @@
(require 'hmac-def)
(require 'jupyter-kernelspec)
(defcustom jupyter-runtime-directory (string-trim-right
(shell-command-to-string
"jupyter --runtime-dir"))
"The Jupyter runtime directory.
This is where kernel connection files are written to when
starting new kernels using a `jupyter-kernel-manager'."
:group 'jupyter
:type 'string)
(defconst jupyter-protocol-version "5.3"
"The jupyter protocol version that is implemented.")

15
jupyter-kernel-manager.el
View file

@ -184,7 +184,7 @@ kernel. Starting a kernel involves the following steps:
(let ((kname-spec (jupyter-find-kernelspec (oref manager name))))
(unless kname-spec
(error "No kernel found that starts with name (%s)" (oref manager name)))
(cl-destructuring-bind (kernel-name . (_dir . spec)) kname-spec
(cl-destructuring-bind (kernel-name . (resource-dir . spec)) kname-spec
;; Ensure we use the full name of the kernel since
;; `jupyter-find-kernelspec' accepts a prefix of a kernel
(oset manager name kernel-name)
@ -193,12 +193,9 @@ kernel. Starting a kernel involves the following steps:
;; `jupyter-connection' objects. The `jupyter-kernel-manager' sets
;; defaults for these when their slots are unbound, see `slot-unbound'.
(let* ((key (jupyter-session-key (oref manager session)))
(resource-dir (string-trim-right
(shell-command-to-string
"jupyter --runtime-dir")))
(conn-file (expand-file-name
(concat "kernel-" key ".json")
resource-dir)))
jupyter-runtime-directory)))
;; Write the connection info file
(with-temp-file (oset manager conn-file conn-file)
(let ((json-encoding-pretty-print t))
@ -209,8 +206,10 @@ kernel. Starting a kernel involves the following steps:
manager kernel-name (plist-get spec :env)
(cl-loop
for arg in (plist-get spec :argv)
if (equal arg "{connection_file}") collect conn-file
else if (equal arg "{resource_dir}") collect resource-dir
if (equal arg "{connection_file}")
collect conn-file
else if (equal arg "{resource_dir}")
collect resource-dir
else collect arg))))
;; Block until the kernel reads the connection file
(with-timeout
@ -222,7 +221,7 @@ kernel. Starting a kernel involves the following steps:
(oset manager kernel proc)
(oset manager conn-file (expand-file-name
(format "kernel-%d.json" (process-id proc))
(file-name-directory conn-file)))
jupyter-runtime-directory))
(rename-file conn-file (oref manager conn-file))
(jupyter-start-channels manager)
manager)))))