allow flexibility in suffix

Author: JohnMount

coverage.txt

@@ -1,5 +1,5 @@
 ============================= test session starts ==============================
-platform darwin -- Python 3.9.12, pytest-7.1.1, pluggy-1.0.0
+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 20 items
@@ -19,26 +19,16 @@ tests/test_stats1.py .                                                   [ 90%]
 tests/test_threshold_stats.py .                                          [ 95%]
 tests/test_typs_in_frame.py .                                            [100%]
 
-=============================== warnings summary ===============================
-../../../../opt/anaconda3/envs/research_env/lib/python3.9/site-packages/seaborn/rcmod.py:82
-  /Users/johnmount/opt/anaconda3/envs/research_env/lib/python3.9/site-packages/seaborn/rcmod.py:82: DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead.
-    if LooseVersion(mpl.__version__) >= "3.0":
-
-../../../../opt/anaconda3/envs/research_env/lib/python3.9/site-packages/setuptools/_distutils/version.py:351
-  /Users/johnmount/opt/anaconda3/envs/research_env/lib/python3.9/site-packages/setuptools/_distutils/version.py:351: DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead.
-    other = LooseVersion(other)
-
--- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
-
----------- coverage: platform darwin, python 3.9.12-final-0 ----------
+---------- coverage: platform darwin, python 3.9.7-final-0 -----------
 Name                      Stmts   Miss  Cover
 ---------------------------------------------
 wvpy/__init__.py              3      0   100%
-wvpy/jtools.py              146     32    78%
+wvpy/jtools.py              156     41    74%
 wvpy/pysheet.py              89     89     0%
 wvpy/render_workbook.py      47     47     0%
 wvpy/util.py                321      7    98%
 ---------------------------------------------
-TOTAL                       606    175    71%
+TOTAL                       616    184    70%
+
 
-======================= 20 passed, 2 warnings in 16.87s ========================
+============================= 20 passed in 13.17s ==============================

pkg/build/lib/wvpy/jtools.py

@@ -186,7 +186,7 @@ def render_as_html(
     Render a Jupyter notebook in the current directory as HTML.
     Exceptions raised in the rendering notebook are allowed to pass trough.
 
-    :param notebook_file_name: name of source file, must end with .ipynb or .py
+    :param notebook_file_name: name of source file, must end with .ipynb or .py (or type gotten from file system)
     :param output_suffix: optional name to add to result name
     :param timeout: Maximum time in seconds each notebook cell is allowed to run.
                     passed to nbconvert.preprocessors.ExecutePreprocessor.
@@ -200,6 +200,19 @@ def render_as_html(
     """
     assert isinstance(notebook_file_name, str)
     assert isinstance(convert_to_pdf, bool)
+    # deal with no suffix case
+    if (not notebook_file_name.endswith(".ipynb")) and (not notebook_file_name.endswith(".py")):
+        py_name = notebook_file_name + ".py"
+        py_exists = os.path.exists(py_name)
+        ipynb_name = notebook_file_name + ".ipynb"
+        ipynb_exists = os.path.exists(ipynb_name)
+        if (py_exists + ipynb_exists) != 1:
+            raise ValueError('{ipynb_exists}: if file suffix is not specified then exactly one of .py or .ipynb file must exist')
+        if ipynb_exists:
+            notebook_file_name = notebook_file_name + '.ipynb'
+        else:
+            notebook_file_name = notebook_file_name + '.py'
+    # get the input
     if notebook_file_name.endswith(".ipynb"):
         suffix = ".ipynb"
         with open(notebook_file_name, "rb") as f:
@@ -210,12 +223,13 @@ def render_as_html(
             text = f.read()
         nb = convert_py_code_to_notebook(text)
     else:
-        raise ValueError("file name must end with .ipynb or .py")
+        raise ValueError('{ipynb_exists}: file must end with .py or .ipynb')
+    # do the conversion
     if init_code is not None:
         assert isinstance(init_code, str)
         nb = prepend_code_cell_to_notebook(
             nb, 
-            code_text=f'\n{init_code}\n')
+            code_text=f'\n\n{init_code}\n\n')
     html_name = os.path.basename(notebook_file_name)
     html_name = html_name.removesuffix(suffix)
     exec_note = ""