Mini header #105

'language_info' section is not in the text metadata any more. Instead, the notebook language is infered from 'kernelspec.name'.
mwouts · Nov 25, 2018 · 0537767 · 0537767
1 parent a2fcc1b
commit 0537767
Show file tree

Hide file tree

Showing 89 changed files with 70 additions and 677 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,13 @@
 Release History
 ---------------
 
+0.8.6 (2018-11-??)
+++++++++++++++++++++++
+
+**Improvements**
+
+- The ``language_info`` section is not part of the default header any more. Language information is now taken from metadata ``kernelspec.language``. (#105).
+
 0.8.5 (2018-11-13)
 ++++++++++++++++++++++
 

diff --git a/README.md b/README.md
@@ -293,7 +293,7 @@ Also, you may want some cells to be active only in the Python, or R Markdown rep
 
 The text representation of the notebook focuses on the part of the notebook that you have written. That is also the part of the notebook that should go under version control. Outputs and metadata that are (re)-constructed automatically when the notebook is executed do not need to enter the text representation.
 
-To that aim, cell metadata `autoscroll`, `collapsed`, `scrolled`, `trusted` and `ExecuteTime` are not included in the text representation. And only the required notebook metadata: `kernelspec`, `language_info` and `jupytext` are saved when a notebook is exported as text.
+To that aim, cell metadata `autoscroll`, `collapsed`, `scrolled`, `trusted` and `ExecuteTime` are not included in the text representation. And only the required notebook metadata: `kernelspec` and `jupytext` are saved when a notebook is exported as text.
 
 When a paired notebook is loaded, Jupytext reconstructs the filtered metadata using the `.ipynb` file. Please keep in mind that the `.ipynb` file is typically not distributed accross contributors, and that the cell metadata may be lost when an input cell changes (cells are matched according to their contents). Thus, if some cell or notebook metadata are important to your notebook, you should preserve it in the text version. Change the default metadata filtering as follows:
 - If you want no YAML header in your script, then set a notebook metadata

diff --git a/jupytext/contentsmanager.py b/jupytext/contentsmanager.py
@@ -29,7 +29,7 @@ def kernelspec_from_language(language):
     try:
         for name in find_kernel_specs():
             ks = get_kernel_spec(name)
-            if ks.language == language:
+            if ks.language == language or (language == 'c++' and ks.language.startswith('C++')):
                 return {'name': name, 'language': language, 'display_name': ks.display_name}
     except (KeyError, ValueError):
         pass

diff --git a/jupytext/header.py b/jupytext/header.py
@@ -22,8 +22,8 @@
 _DEFAULT_NOTEBOOK_METADATA = ','.join([
     # Preserve Jupytext section
     'jupytext',
-    # Preserve kernel specs and language_info
-    'kernelspec', 'language_info',
+    # Preserve kernel specs
+    'kernelspec',
     # Kernel_info found in Nteract notebooks
     'kernel_info'])
 

diff --git a/jupytext/languages.py b/jupytext/languages.py
@@ -19,15 +19,21 @@ def default_language_from_metadata_and_ext(notebook, ext):
     from the given file extension"""
     default_from_ext = _SCRIPT_EXTENSIONS.get(ext, {}).get('language', 'python')
 
-    return (notebook.metadata.get('language_info', {}).get('name')
-            or notebook.metadata.get('jupytext', {}).get('main_language') or default_from_ext)
+    language = (notebook.metadata.get('kernelspec', {}).get('language')
+                or notebook.metadata.get('jupytext', {}).get('main_language')
+                or default_from_ext)
+
+    if language.startswith('C++'):
+        language = 'c++'
+
+    return language
 
 
 def set_main_and_cell_language(metadata, cells, ext):
     """Set main language for the given collection of cells, and
     use magics for cells that use other languages"""
     default_from_ext = _SCRIPT_EXTENSIONS.get(ext, {}).get('language', 'python')
-    main_language = (metadata.get('language_info', {}).get('name') or
+    main_language = (metadata.get('kernelspec', {}).get('language') or
                      metadata.get('jupytext', {}).get('main_language'))
     if main_language is None:
         languages = {default_from_ext: 0.5}
@@ -38,8 +44,8 @@ def set_main_and_cell_language(metadata, cells, ext):
 
         main_language = max(languages, key=languages.get)
 
-        # save main language when not kernel is set
-        if 'name' not in metadata.get('language_info', {}):
+        # save main language when no kernel is set
+        if 'language' not in metadata.get('kernelspec', {}):
             metadata.setdefault('jupytext', {})['main_language'] = main_language
 
     # Remove 'language' meta data and add a magic if not main language

diff --git a/jupytext/version.py b/jupytext/version.py
@@ -1,3 +1,3 @@
 """Jupytext's version number"""
 
-__version__ = '0.8.5'
+__version__ = '0.8.6'
diff --git a/tests/notebooks/Rmd/chunk_options.Rmd b/tests/notebooks/Rmd/chunk_options.Rmd
@@ -3,8 +3,10 @@ title: "Test chunk options in Rmd/Jupyter conversion"
 author: "Marc Wouts"
 date: "June 16, 2018"
 jupyter:
-  language_info:
-    name: python
+  kernelspec:
+    display_name: Python
+    language: python
+    name: python3
 ---
 
 ```{r knitr_setup, include=FALSE}

diff --git a/tests/notebooks/mirror/Rmd_to_ipynb/R_sample.ipynb b/tests/notebooks/mirror/Rmd_to_ipynb/R_sample.ipynb
@@ -41,7 +41,9 @@
   }
  ],
  "metadata": {
-  "main_language": "R"
+  "jupytext": {
+   "main_language": "R"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2

diff --git a/tests/notebooks/mirror/Rmd_to_ipynb/chunk_options.ipynb b/tests/notebooks/mirror/Rmd_to_ipynb/chunk_options.ipynb
@@ -59,8 +59,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

diff --git a/tests/notebooks/mirror/Rmd_to_ipynb/ioslides.ipynb b/tests/notebooks/mirror/Rmd_to_ipynb/ioslides.ipynb
@@ -87,7 +87,9 @@
   }
  ],
  "metadata": {
-  "main_language": "python"
+  "jupytext": {
+   "main_language": "python"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2

diff --git a/tests/notebooks/mirror/Rmd_to_ipynb/knitr-spin.ipynb b/tests/notebooks/mirror/Rmd_to_ipynb/knitr-spin.ipynb
@@ -172,7 +172,9 @@
   }
  ],
  "metadata": {
-  "main_language": "R"
+  "jupytext": {
+   "main_language": "R"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2

diff --git a/tests/notebooks/mirror/Rmd_to_ipynb/markdown.ipynb b/tests/notebooks/mirror/Rmd_to_ipynb/markdown.ipynb
@@ -34,7 +34,9 @@
   }
  ],
  "metadata": {
-  "main_language": "python"
+  "jupytext": {
+   "main_language": "python"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/Notebook with many hash signs.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/Notebook with many hash signs.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.6
 ---
 
 ##################################################################

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/Notebook_with_R_magic.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/Notebook_with_R_magic.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 2
     language: python
     name: python2
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 2
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython2
-    version: 2.7.11
 ---
 
 # A notebook with R cells

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/World population.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/World population.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.6
 ---
 
 # A quick insight at world population

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/convert_to_py_then_test_with_update83.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/convert_to_py_then_test_with_update83.Rmd
@@ -7,16 +7,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.5.3
 ---
 
 ```{python}

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/frozen_cell.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/frozen_cell.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.7.0
 ---
 
 ```{python}

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/ir_notebook.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/ir_notebook.Rmd
@@ -4,13 +4,6 @@ jupyter:
     display_name: R
     language: R
     name: ir
-  language_info:
-    codemirror_mode: r
-    file_extension: .r
-    mimetype: text/x-r-source
-    name: R
-    pygments_lexer: r
-    version: 3.5.0
 ---
 
 This is a jupyter notebook that uses the IR kernel.

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/julia_benchmark_plotly_barchart.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/julia_benchmark_plotly_barchart.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.6
 ---
 
 ```{python}

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/jupyter.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/jupyter.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.4
 ---
 
 # Jupyter notebook

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/jupyter_again.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/jupyter_again.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.5
 ---
 
 ```{python}

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/jupyter_with_raw_cell_in_body.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/jupyter_with_raw_cell_in_body.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.6
 ---
 
 ```{python}

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/jupyter_with_raw_cell_on_top.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/jupyter_with_raw_cell_on_top.Rmd
@@ -11,16 +11,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.5
 ---
 
 ```{python}

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/notebook_with_complex_metadata.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/notebook_with_complex_metadata.Rmd
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.5.1
 ---
 
 ```{python}

diff --git a/tests/notebooks/mirror/ipynb_to_Rmd/nteract_with_parameter.Rmd b/tests/notebooks/mirror/ipynb_to_Rmd/nteract_with_parameter.Rmd
@@ -6,16 +6,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.6
 ---
 
 ```{python outputHidden=FALSE, inputHidden=FALSE, tags=c("parameters")}

diff --git a/tests/notebooks/mirror/ipynb_to_md/Notebook with many hash signs.md b/tests/notebooks/mirror/ipynb_to_md/Notebook with many hash signs.md
@@ -4,16 +4,6 @@ jupyter:
     display_name: Python 3
     language: python
     name: python3
-  language_info:
-    codemirror_mode:
-      name: ipython
-      version: 3
-    file_extension: .py
-    mimetype: text/x-python
-    name: python
-    nbconvert_exporter: python
-    pygments_lexer: ipython3
-    version: 3.6.6
 ---
 
 ##################################################################