Normalize the sample notebooks (#1003)

* Version 1.14.2-dev * Normalize the sample notebooks (#1002) * Fix issues that `normalize` did not fix * Remove outputs and metadata when they exist * Use Path rather than path * Test that text notebooks are normalized * Regenerate mirror text notebooks Following the normalization of ipynb notebooks * Skip test if recent nbformat is not available * Add Python 3.11 + Use Py3.9 for conda * Update CHANGELOG.md * Jupytext is tested against Python 3.10 and 3.11 on the CI * Don't include test failure in coverage
mwouts · Oct 31, 2022 · be9b65b · be9b65b
1 parent 12964ef
commit be9b65b
Show file tree

Hide file tree

Showing 25 changed files with 297 additions and 255 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -24,10 +24,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.9
       - uses: pre-commit/[email protected]
 
   analyse:
@@ -41,7 +41,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           # We must fetch at least the immediate parents so that if this is
-          # a pull request then we can checkout the head.
+          # a pull request then we can check out the head.
           fetch-depth: 2
 
       # If this run was triggered by a pull request event, then checkout
@@ -64,7 +64,7 @@ jobs:
     if: ${{ needs.skip_duplicate.outputs.should_skip == 'false' }}
     strategy:
       matrix:
-        python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -116,7 +116,7 @@ jobs:
     strategy:
       matrix:
         os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
-        python-version: [ 3.7 ]
+        python-version: [ 3.9 ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -173,7 +173,7 @@ jobs:
       if: ${{ needs.skip_duplicate.outputs.should_skip == 'false' }}
       strategy:
         matrix:
-          python-version: [ 3.7 ]
+          python-version: [ 3.9 ]
       runs-on: ubuntu-latest
       steps:
         - name: Checkout
@@ -200,7 +200,7 @@ jobs:
     if: ${{ needs.skip_duplicate.outputs.should_skip == 'false' }}
     strategy:
       matrix:
-        python-version: [ 3.7 ]
+        python-version: [ 3.9 ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -224,7 +224,7 @@ jobs:
     if: ${{ needs.skip_duplicate.outputs.should_skip == 'false' }}
     strategy:
       matrix:
-        python-version: [ 3.7 ]
+        python-version: [ 3.9 ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -254,10 +254,10 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with:
-          python-version: 3.7
+          python-version: 3.9
       - name: Build package
         run: |
           pip install wheel jupyter-packaging jupyterlab>=3
@@ -280,10 +280,10 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v1
         with:
-          python-version: 3.7
+          python-version: 3.9
       - name: Build package
         run: |
           pip install wheel jupyter-packaging jupyterlab>=3

diff --git a/codecov.yml b/codecov.yml
@@ -1,5 +1,5 @@
 comment:
-  after_n_builds: 11
+  after_n_builds: 12
 
 coverage:
   status:

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,19 @@
 Jupytext ChangeLog
 ==================
 
+1.14.2-dev (2022-10-??)
+-------------------
+
+**Fixed**
+- The sample notebooks have been normalized with `nbformat.validator.normalize` ([#1002](https://github.com/mwouts/jupytext/issues/1002)).
+
+**Changed**
+- The CI uses Python 3.9 rather than 3.7 when testing conda environments
+
+**Added**
+- We now test Jupytext against Python 3.6 to 3.11 on the CI
+
+
 1.14.1 (2022-07-29)
 -------------------
 

diff --git a/jupytext/version.py b/jupytext/version.py
@@ -1,3 +1,3 @@
 """Jupytext's version number"""
 
-__version__ = "1.14.1"
+__version__ = "1.14.2-dev"
diff --git a/setup.py b/setup.py
@@ -60,6 +60,8 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
 )
 

diff --git a/tests/notebooks/ipynb_R/R notebook with invalid cell keys.ipynb b/tests/notebooks/ipynb_R/R notebook with invalid cell keys.ipynb
@@ -25,8 +25,7 @@
       ]
      },
      "metadata": {},
-     "output_type": "display_data",
-     "source": "R display func"
+     "output_type": "display_data"
     }
    ],
    "source": [

diff --git a/tests/notebooks/ipynb_clojure/html-demo.ipynb b/tests/notebooks/ipynb_clojure/html-demo.ipynb
@@ -6,8 +6,7 @@
    "source": [
     "# Clojupyter Demo\n",
     "\n",
-    "This example notebook is from the [Clojupyter](https://github.com/clojupyter/clojupyter/blob/1637f6b2557f01db1e35bae5389bc38522eefe9a/examples/html-demo.ipynb) project.",
-    "\n",
+    "This example notebook is from the [Clojupyter](https://github.com/clojupyter/clojupyter/blob/1637f6b2557f01db1e35bae5389bc38522eefe9a/examples/html-demo.ipynb) project.\n",
     "This notebook demonstrates some of the more advanced features of Clojupyter."
    ]
   },

diff --git a/tests/notebooks/ipynb_ocaml/ocaml_notebook.ipynb b/tests/notebooks/ipynb_ocaml/ocaml_notebook.ipynb
@@ -2,57 +2,61 @@
  "cells": [
   {
    "cell_type": "markdown",
+   "id": "0ce05620",
+   "metadata": {},
    "source": [
     "# Example of an OCaml notebook"
-   ],
-   "metadata": {}
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": 3,
-   "source": [
-    "let sum x y = x + y"
-   ],
+   "id": "5c62301c",
+   "metadata": {},
    "outputs": [
     {
-     "output_type": "execute_result",
      "data": {
       "text/plain": [
        "val sum : int -> int -> int = <fun>\n"
       ]
      },
+     "execution_count": 3,
      "metadata": {},
-     "execution_count": 3
+     "output_type": "execute_result"
     }
    ],
-   "metadata": {}
+   "source": [
+    "let sum x y = x + y"
+   ]
   },
   {
    "cell_type": "markdown",
+   "id": "f89c9670",
+   "metadata": {},
    "source": [
     "Let's try our function:"
-   ],
-   "metadata": {}
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": 4,
-   "source": [
-    "sum 3 4 = 7 + 0"
-   ],
+   "id": "d2b696e3",
+   "metadata": {},
    "outputs": [
     {
-     "output_type": "execute_result",
      "data": {
       "text/plain": [
        "- : bool = true\n"
       ]
      },
+     "execution_count": 4,
      "metadata": {},
-     "execution_count": 4
+     "output_type": "execute_result"
     }
    ],
-   "metadata": {}
+   "source": [
+    "sum 3 4 = 7 + 0"
+   ]
   }
  ],
  "metadata": {
@@ -76,4 +80,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}
diff --git a/tests/notebooks/ipynb_ps1/powershell.ipynb b/tests/notebooks/ipynb_ps1/powershell.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [  
+ "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/tests/notebooks/ipynb_py/jupyter.ipynb b/tests/notebooks/ipynb_py/jupyter.ipynb
@@ -41,7 +41,9 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {"scrolled":true},
+   "metadata": {
+    "scrolled": true
+   },
    "outputs": [
     {
      "data": {

diff --git a/tests/notebooks/ipynb_py/notebook_with_complex_metadata.ipynb b/tests/notebooks/ipynb_py/notebook_with_complex_metadata.ipynb
@@ -27,7 +27,7 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.5.1"
-  }, 
+  },
   "widgets": {
    "state": {
     "a65a11f142ca44eebc913788d256adcb": {
@@ -37,7 +37,7 @@
       }
      ]
     }
-   }, 
+   },
    "version": "1.2.0"
   }
  },