getnikola · Mar 4, 2017 · Mar 4, 2017 · Mar 4, 2017
Showing with 31 additions and 27 deletions.

+1 −0 AUTHORS.txt

+1 −0 CHANGES.txt

+29 −1 nikola/plugins/compile/ipynb.py

+0 −26 nikola/utils.py
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -104,6 +104,7 @@
 * `Sean Pue <https://github.com/seanpue>`_
 * `Simon van der Veldt <https://github.com/simonvanderveldt>`_
 * `Stefan Näwe <https://github.com/snaewe>`_
+* `Stephan Fitzpatrick <https://github.com/knowsuchagency>`_
 * `Sukil Etxenike <https://github.com/sukiletxe>`_
 * `Thibauld Nion <https://github.com/tibonihoo>`_
 * `Thomas Burette <https://github.com/tburette>`_

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* Add Jupyter config as dependency for jupyter posts (by @knowsuchagency)
 * Add ``RSS_COPYRIGHT``, ``RSS_COPYRIGHT_PLAIN``, and
   ``RSS_COPYRIGHT_FORMATS`` options in conf.py which can be disabled
   by specifying ``copyright_=False`` to ``generic_rss_renderer``, or

diff --git a/nikola/plugins/compile/ipynb.py b/nikola/plugins/compile/ipynb.py
@@ -28,6 +28,7 @@
 
 from __future__ import unicode_literals, print_function
 import io
+import json
 import os
 import sys
 
@@ -61,7 +62,7 @@
         ipy_modern = None
 
 from nikola.plugin_categories import PageCompiler
-from nikola.utils import makedirs, req_missing, get_logger, STDERR_HANDLER, get_default_jupyter_config
+from nikola.utils import makedirs, req_missing, get_logger, STDERR_HANDLER
 
 
 class CompileIPynb(PageCompiler):
@@ -191,3 +192,30 @@ def create_post(self, path, **kw):
                 nbformat.write(nb, fd, 4)
             else:
                 nbformat.write(nb, fd, 'ipynb')
+
+
+def get_default_jupyter_config():
+    """
+    Search default jupyter configuration location paths
+    and return dictionary from configuration json files.
+    """
+    config = {}
+    try:
+        from jupyter_core.paths import jupyter_config_path
+    except ImportError:
+        # jupyter not installed, must be using IPython
+        return config
+
+    for parent in jupyter_config_path():
+        try:
+            for file in os.listdir(parent):
+                if 'nbconvert' in file and file.endswith('.json'):
+                    abs_path = os.path.join(parent, file)
+                    with open(abs_path) as config_file:
+                        config.update(json.load(config_file))
+        except FileNotFoundError:
+            # some paths jupyter uses to find configurations
+            # may not exist
+            pass
+
+    return config
diff --git a/nikola/utils.py b/nikola/utils.py
@@ -2040,29 +2040,3 @@ def html_unescape(s):
         """Convert all named and numeric character references  in the string s to the corresponding unicode characters."""
         h = HTMLParser()
         return h.unescape(s)
-
-def get_default_jupyter_config():
-    """
-    Search default jupyter configuration location paths
-    and return dictionary from configuration json files.
-    """
-    config = {}
-    try:
-        from jupyter_core.paths import jupyter_config_path
-    except ImportError:
-        # jupyter not installed, must be using IPython
-        return config
-
-    for parent in jupyter_config_path():
-        try:
-            for file in os.listdir(parent):
-                if 'nbconvert' in file and file.endswith('.json'):
-                    abs_path = os.path.join(parent, file)
-                    with open(abs_path) as config_file:
-                        config.update(json.load(config_file))
-        except FileNotFoundError:
-            # some paths jupyter uses to find configurations
-            # may not exist
-            pass
-
-    return config