02/06: gnu: Replace JUPYTER_CONFIG_DIR with JUPYTER_CONFIG_PATH.

[guix-commits]

lbraun pushed a commit to branch master
in repository guix.

commit c63b55d1283d9a4bfc5ecaf1cab01cd98a467b69
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Wed Dec 15 10:44:40 2021 +0100

    gnu: Replace JUPYTER_CONFIG_DIR with JUPYTER_CONFIG_PATH.
    
    Judging by the documentation
    (https://jupyter.readthedocs.io/en/latest/use/jupyter-directories.html)
    _DIR can only be a single value, whereas _PATH supports :-delimited
    values and extends _DIR with extra directories.
    
    * gnu/packages/python-xyz.scm (python-jupyter-core)[native-search-paths]:
    Replace _DIR with _PATH.
    (python-nbconvert)[arguments]: Unset JUPYTER_CONFIG_PATH during tests.
    (python-notebook)[arguments]: Dito.
---
 gnu/packages/python-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7f32fd2..5e26fe7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8334,7 +8334,7 @@ without using the configuration machinery.")
     ;; search paths.
     (native-search-paths
      (list (search-path-specification
-            (variable "JUPYTER_CONFIG_DIR")
+            (variable "JUPYTER_CONFIG_PATH")
             (files '("etc/jupyter")))
            (search-path-specification
             (variable "JUPYTER_PATH")
@@ -11962,8 +11962,6 @@ time.")
              (when tests?
                ;; Some tests invoke the installed nbconvert binary.
                (add-installed-pythonpath inputs outputs)
-               ;; Tries to write to this path.
-               (unsetenv "JUPYTER_CONFIG_DIR")
                ;; Tests depend on templates installed to output.
                (setenv "JUPYTER_PATH"
                        (string-append
@@ -12082,6 +12080,8 @@ convert an @code{.ipynb} notebook file into various 
static formats including:
              (delete-file-recursively "notebook/tests/selenium")
              (when tests?
                (add-installed-pythonpath inputs outputs)
+               ;; Interferes with test expectations.
+               (unsetenv "JUPYTER_CONFIG_PATH")
                ;; Some tests do not expect all files to be installed in the
                ;; same directory, but JUPYTER_PATH contains multiple entries.
                (unsetenv "JUPYTER_PATH")