rebuild and retest

Author: JohnMount

coverage.txt

@@ -2,33 +2,19 @@
 platform darwin -- Python 3.9.16, pytest-7.1.2, pluggy-1.0.0
 rootdir: /Users/johnmount/Documents/work/wvpy/pkg
 plugins: anyio-3.5.0, cov-3.0.0
-collected 4 items
+collected 5 items
 
-tests/test_nb_fns.py ....                                                [100%]
-
-=============================== warnings summary ===============================
-../../../../opt/anaconda3/envs/wvpy_dev_env/lib/python3.9/site-packages/jupyter_client/connect.py:27
-  /Users/johnmount/opt/anaconda3/envs/wvpy_dev_env/lib/python3.9/site-packages/jupyter_client/connect.py:27: DeprecationWarning: Jupyter is migrating its paths to use standard platformdirs
-  given by the platformdirs library.  To remove this warning and
-  see the appropriate new directories, set the environment variable
-  `JUPYTER_PLATFORM_DIRS=1` and then run `jupyter --paths`.
-  The use of platformdirs will be the default in `jupyter_core` v6
-    from jupyter_core.paths import jupyter_data_dir
-
-tests/test_nb_fns.py::test_jupyter_notebook_parameterized_good
-  /Users/johnmount/opt/anaconda3/envs/wvpy_dev_env/lib/python3.9/site-packages/nbformat/v4/nbbase.py:40: MissingIDFieldWarning: Code cell is missing an id field, this will become a hard error in future nbformat versions. You may want to use `normalize()` on your notebooks before validations (available since nbformat 5.1.4). Previous versions of nbformat are fixing this issue transparently, and will stop doing so in the future.
-    return validate_orig(node, ref=ref, version=nbformat)
-
--- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
+tests/test_nb_fns.py .....                                               [100%]
 
 ---------- coverage: platform darwin, python 3.9.16-final-0 ----------
 Name                      Stmts   Miss  Cover
 ---------------------------------------------
 wvpy/__init__.py              3      0   100%
-wvpy/jtools.py              223     91    59%
+wvpy/jtools.py              227     91    60%
 wvpy/pysheet.py              99     99     0%
 wvpy/render_workbook.py      54     54     0%
 ---------------------------------------------
-TOTAL                       379    244    36%
+TOTAL                       383    244    36%
+
 
-======================== 4 passed, 2 warnings in 8.72s =========================
+============================== 5 passed in 7.73s ===============================

pkg/build/lib/wvpy/jtools.py

@@ -23,6 +23,12 @@
 except ModuleNotFoundError:
     pass
 
+nbf_v = nbformat.v4
+
+#def _normalize(nb):
+#    # try and work around version mismatches
+#    return nbformat.validator.normalize(nb, version=4, version_minor=5)[1]
+
 
 # noinspection PyBroadException
 def pretty_format_python(python_txt: str, *, black_mode=None) -> str:
@@ -69,7 +75,6 @@ def convert_py_code_to_notebook(
     begin_text_regexp = re.compile(r"^\s*r?((''')|(\"\"\"))\s*begin\s+text\s*$")
     end_text_regexp = re.compile(r"^\s*r?((''')|(\"\"\"))\s*#\s*end\s+text\s*$")
     end_code_regexp = re.compile(r"(^\s*r?'''\s*end\s+code\s*'''\s*$)|(^\s*r?\"\"\"\s*end\s+code\s*\"\"\"\s*$)")
-    nbf_v = nbformat.v4
     # run a little code collecting state machine
     cells = []
     collecting_python = []
@@ -110,8 +115,10 @@ def convert_py_code_to_notebook(
                 collecting_python.append(line)
             if collecting_text is not None:
                 collecting_text.append(line)
+    for i in range(len(cells)):
+        cells[i]["id"] = f"cell{i}"
     nb = nbf_v.new_notebook(cells=cells)
-    nb = nbformat.validator.normalize(nb)[1]
+    # nb = _normalize(nb)
     return nb
 
 
@@ -127,12 +134,18 @@ def prepend_code_cell_to_notebook(
     :param code_text: Python source code to add
     :return: new notebook
     """
-    nbf_v = nbformat.v4
-    cells = [nbf_v.new_code_cell(code_text)] + list(nb.cells)
+    header_cell = nbf_v.new_code_cell(code_text)
+    # set cell ids to avoid:
+    # "MissingIDFieldWarning: Code cell is missing an id field, this will become a hard error in future nbformat versions."
+    header_cell["id"] = "wvpy_header_cell"
+    orig_cells = [c.copy() for c in nb.cells]
+    for i in range(len(orig_cells)):
+        orig_cells[i]["id"] = f"cell{i}"
+    cells = [header_cell] + orig_cells
     nb_out = nbf_v.new_notebook(
         cells=cells
     )
-    nb_out = nbformat.validator.normalize(nb_out)[1]
+    # nb_out = _normalize(nb_out)
     return nb_out
 
 
@@ -288,7 +301,7 @@ def render_as_html(
     else:
         raise ValueError('{ipynb_exists}: file must end with .py or .ipynb')
     # do the conversion
-    if init_code is not None:
+    if (init_code is not None) and (len(init_code) > 0):
         assert isinstance(init_code, str)
         nb = prepend_code_cell_to_notebook(
             nb,