rebuild and retest

Author: JohnMount

coverage.txt

@@ -2,33 +2,33 @@
 platform darwin -- Python 3.9.7, pytest-6.2.5, py-1.11.0, pluggy-1.0.0
 rootdir: /Users/johnmount/Documents/work/wvpy/pkg
 plugins: anyio-3.5.0, cov-3.0.0
-collected 19 items
+collected 20 items
 
 tests/test_cross_plan1.py .                                              [  5%]
 tests/test_cross_predict.py ..                                           [ 15%]
-tests/test_deviance_calc.py .                                            [ 21%]
-tests/test_eval_fn_pre_row.py .                                          [ 26%]
-tests/test_match_auc.py .                                                [ 31%]
-tests/test_nb_fns.py ...                                                 [ 47%]
-tests/test_onehot.py ..                                                  [ 57%]
-tests/test_perm_score_vars.py .                                          [ 63%]
-tests/test_plots.py .                                                    [ 68%]
-tests/test_se.py .                                                       [ 73%]
-tests/test_search_grid.py ..                                             [ 84%]
-tests/test_stats1.py .                                                   [ 89%]
-tests/test_threshold_stats.py .                                          [ 94%]
+tests/test_deviance_calc.py .                                            [ 20%]
+tests/test_eval_fn_pre_row.py .                                          [ 25%]
+tests/test_match_auc.py .                                                [ 30%]
+tests/test_nb_fns.py ....                                                [ 50%]
+tests/test_onehot.py ..                                                  [ 60%]
+tests/test_perm_score_vars.py .                                          [ 65%]
+tests/test_plots.py .                                                    [ 70%]
+tests/test_se.py .                                                       [ 75%]
+tests/test_search_grid.py ..                                             [ 85%]
+tests/test_stats1.py .                                                   [ 90%]
+tests/test_threshold_stats.py .                                          [ 95%]
 tests/test_typs_in_frame.py .                                            [100%]
 
 ---------- coverage: platform darwin, python 3.9.7-final-0 -----------
 Name                      Stmts   Miss  Cover
 ---------------------------------------------
 wvpy/__init__.py              3      0   100%
-wvpy/jtools.py              136     34    75%
+wvpy/jtools.py              135     27    80%
 wvpy/pysheet.py              74     74     0%
 wvpy/render_workbook.py      46     46     0%
 wvpy/util.py                321      7    98%
 ---------------------------------------------
-TOTAL                       580    161    72%
+TOTAL                       579    154    73%
 
 
-============================= 19 passed in 14.58s ==============================
+============================= 20 passed in 13.11s ==============================

pkg/build/lib/wvpy/jtools.py

@@ -19,6 +19,8 @@ def convert_py_code_to_notebook(text: str) -> nbformat.notebooknode.NotebookNode
     :param text: Python text to convert.
     :return: a notebook 
     """
+    # https://stackoverflow.com/a/23729611/6901725
+    # https://nbviewer.org/gist/fperez/9716279
     assert isinstance(text, str)
     lines = text.splitlines()
     begin_text_regexp = re.compile(r"^r?'''\s*begin\s+text\s*$")
@@ -68,6 +70,24 @@ def convert_py_code_to_notebook(text: str) -> nbformat.notebooknode.NotebookNode
     return nb
 
 
+def prepend_code_cell_to_notebook(
+    nb: nbformat.notebooknode.NotebookNode,
+    *,
+    code_text: str,
+) -> nbformat.notebooknode.NotebookNode:
+    """
+    Prepend a code cell to a Jupyter notebook.
+
+    :param nb: Jupyter notebook to alter
+    :param code_text: Python source code to add
+    :return: new notebook
+    """
+    nbf_v = nbformat.v4
+    nb_out = nbf_v.new_notebook()
+    nb_out['cells'] = [nbf_v.new_code_cell(code_text)] + list(nb.cells)
+    return nb_out
+
+
 def convert_py_file_to_notebook(*, py_file: str, ipynb_file: str) -> None:
     """
     Convert python text to a notebook. 
@@ -149,8 +169,7 @@ def render_as_html(
     timeout:int = 60000,
     kernel_name: Optional[str] = None,
     verbose: bool = True,
-    parameters = None,
-    parameter_file_name: Optional[str] = None,
+    init_code: Optional[str] = None,
     exclude_input: bool = False,
     prompt_strip_regexp: Optional[str] = r'<\s*div\s+class\s*=\s*"jp-OutputPrompt[^<>]*>[^<>]*Out[^<>]*<\s*/div\s*>',
 ) -> None:
@@ -164,8 +183,7 @@ def render_as_html(
                     passed to nbconvert.preprocessors.ExecutePreprocessor.
     :param kernel_name: Jupyter kernel to use. passed to nbconvert.preprocessors.ExecutePreprocessor.
     :param verbose logical, if True print while running 
-    :param parameters: arbitrary object to write to paramater_file_name
-    :param parameter_file_name: file name to pickle parameters to
+    :param init_code: Python init code for first cell
     :param exclude_input: if True, exclude input cells
     :param prompt_strip_regexp: regexp to strip prompts, only used if exclude_input is True
     :return: None
@@ -182,6 +200,9 @@ def render_as_html(
         nb = convert_py_code_to_notebook(text)
     else:
         raise ValueError("file name must end with .ipynb or .py")
+    if init_code is not None:
+        assert isinstance(init_code, str)
+        nb = prepend_code_cell_to_notebook(nb, code_text=init_code)
     html_name = notebook_file_name.removesuffix(suffix)
     exec_note = ""
     if output_suffix is not None:
@@ -193,10 +214,6 @@ def render_as_html(
         os.remove(html_name)
     except FileNotFoundError:
         pass
-    if parameter_file_name is not None:
-        assert isinstance(parameter_file_name, str)
-        with open(parameter_file_name, "wb") as f:
-            pickle.dump(parameters, f)
     caught = None
     try:
         if verbose:
@@ -222,11 +239,6 @@ def render_as_html(
             f.write(html_body)
     except Exception as e:
         caught = e
-    if parameter_file_name is not None:
-        try:
-            os.remove(parameter_file_name)
-        except FileNotFoundError:
-            pass
     if caught is not None:
         raise caught
     if verbose: