Skip to content

Commit c8addeb

Browse files
committed
allow multiple files in render main
1 parent e412b17 commit c8addeb

File tree

7 files changed

+36
-29
lines changed

7 files changed

+36
-29
lines changed

coverage.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ wvpy/util.py 321 7 98%
4141
---------------------------------------------
4242
TOTAL 547 128 77%
4343

44-
======================= 19 passed, 2 warnings in 14.59s ========================
44+
======================= 19 passed, 2 warnings in 14.35s ========================

pkg/build/lib/wvpy/render_workbook.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212

1313
def main() -> int:
1414
parser = argparse.ArgumentParser(description="Render .py or .ipynb to .html by executing in Jupyter")
15-
parser.add_argument('infile', metavar='infile', type=str, nargs=1,
16-
help='name of input file')
15+
parser.add_argument('infile', metavar='infile', type=str, nargs='+',
16+
help='name of input file(s)')
1717
parser.add_argument('--strip_input', action='store_true')
1818
parser.add_argument('--quiet', action='store_true')
1919
args = parser.parse_args()
20-
assert len(args.infile) == 1
21-
input_file_name = args.infile[0]
22-
assert isinstance(input_file_name, str)
23-
assert os.path.exists(input_file_name)
24-
render_as_html(input_file_name, exclude_input=args.strip_input, verbose=args.quiet == False)
20+
assert len(args.infile) > 0
21+
for input_file_name in args.infile:
22+
assert isinstance(input_file_name, str)
23+
assert os.path.exists(input_file_name)
24+
render_as_html(input_file_name, exclude_input=args.strip_input, verbose=args.quiet == False)
2525
return 0
2626

2727

10 Bytes
Binary file not shown.

pkg/dist/wvpy-0.3.1.tar.gz

123 KB
Binary file not shown.

pkg/docs/wvpy/render_workbook.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ <h1 class="modulename">
6565
</span><span id="L-10"><a href="#L-10"><span class="linenos">10</span></a>
6666
</span><span id="L-11"><a href="#L-11"><span class="linenos">11</span></a><span class="k">def</span> <span class="nf">main</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="nb">int</span><span class="p">:</span>
6767
</span><span id="L-12"><a href="#L-12"><span class="linenos">12</span></a> <span class="n">parser</span> <span class="o">=</span> <span class="n">argparse</span><span class="o">.</span><span class="n">ArgumentParser</span><span class="p">(</span><span class="n">description</span><span class="o">=</span><span class="s2">&quot;Render .py or .ipynb to .html by executing in Jupyter&quot;</span><span class="p">)</span>
68-
</span><span id="L-13"><a href="#L-13"><span class="linenos">13</span></a> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s1">&#39;infile&#39;</span><span class="p">,</span> <span class="n">metavar</span><span class="o">=</span><span class="s1">&#39;infile&#39;</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="nb">str</span><span class="p">,</span> <span class="n">nargs</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
69-
</span><span id="L-14"><a href="#L-14"><span class="linenos">14</span></a> <span class="n">help</span><span class="o">=</span><span class="s1">&#39;name of input file&#39;</span><span class="p">)</span>
68+
</span><span id="L-13"><a href="#L-13"><span class="linenos">13</span></a> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s1">&#39;infile&#39;</span><span class="p">,</span> <span class="n">metavar</span><span class="o">=</span><span class="s1">&#39;infile&#39;</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="nb">str</span><span class="p">,</span> <span class="n">nargs</span><span class="o">=</span><span class="s1">&#39;+&#39;</span><span class="p">,</span>
69+
</span><span id="L-14"><a href="#L-14"><span class="linenos">14</span></a> <span class="n">help</span><span class="o">=</span><span class="s1">&#39;name of input file(s)&#39;</span><span class="p">)</span>
7070
</span><span id="L-15"><a href="#L-15"><span class="linenos">15</span></a> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s1">&#39;--strip_input&#39;</span><span class="p">,</span> <span class="n">action</span><span class="o">=</span><span class="s1">&#39;store_true&#39;</span><span class="p">)</span>
7171
</span><span id="L-16"><a href="#L-16"><span class="linenos">16</span></a> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s1">&#39;--quiet&#39;</span><span class="p">,</span> <span class="n">action</span><span class="o">=</span><span class="s1">&#39;store_true&#39;</span><span class="p">)</span>
7272
</span><span id="L-17"><a href="#L-17"><span class="linenos">17</span></a> <span class="n">args</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="n">parse_args</span><span class="p">()</span>
73-
</span><span id="L-18"><a href="#L-18"><span class="linenos">18</span></a> <span class="k">assert</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="o">.</span><span class="n">infile</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span>
74-
</span><span id="L-19"><a href="#L-19"><span class="linenos">19</span></a> <span class="n">input_file_name</span> <span class="o">=</span> <span class="n">args</span><span class="o">.</span><span class="n">infile</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
75-
</span><span id="L-20"><a href="#L-20"><span class="linenos">20</span></a> <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">,</span> <span class="nb">str</span><span class="p">)</span>
76-
</span><span id="L-21"><a href="#L-21"><span class="linenos">21</span></a> <span class="k">assert</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">)</span>
77-
</span><span id="L-22"><a href="#L-22"><span class="linenos">22</span></a> <span class="n">render_as_html</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">,</span> <span class="n">exclude_input</span><span class="o">=</span><span class="n">args</span><span class="o">.</span><span class="n">strip_input</span><span class="p">,</span> <span class="n">verbose</span><span class="o">=</span><span class="n">args</span><span class="o">.</span><span class="n">quiet</span> <span class="o">==</span> <span class="kc">False</span><span class="p">)</span>
73+
</span><span id="L-18"><a href="#L-18"><span class="linenos">18</span></a> <span class="k">assert</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="o">.</span><span class="n">infile</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">0</span>
74+
</span><span id="L-19"><a href="#L-19"><span class="linenos">19</span></a> <span class="k">for</span> <span class="n">input_file_name</span> <span class="ow">in</span> <span class="n">args</span><span class="o">.</span><span class="n">infile</span><span class="p">:</span>
75+
</span><span id="L-20"><a href="#L-20"><span class="linenos">20</span></a> <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">,</span> <span class="nb">str</span><span class="p">)</span>
76+
</span><span id="L-21"><a href="#L-21"><span class="linenos">21</span></a> <span class="k">assert</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">)</span>
77+
</span><span id="L-22"><a href="#L-22"><span class="linenos">22</span></a> <span class="n">render_as_html</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">,</span> <span class="n">exclude_input</span><span class="o">=</span><span class="n">args</span><span class="o">.</span><span class="n">strip_input</span><span class="p">,</span> <span class="n">verbose</span><span class="o">=</span><span class="n">args</span><span class="o">.</span><span class="n">quiet</span> <span class="o">==</span> <span class="kc">False</span><span class="p">)</span>
7878
</span><span id="L-23"><a href="#L-23"><span class="linenos">23</span></a> <span class="k">return</span> <span class="mi">0</span>
7979
</span><span id="L-24"><a href="#L-24"><span class="linenos">24</span></a>
8080
</span><span id="L-25"><a href="#L-25"><span class="linenos">25</span></a>
@@ -108,16 +108,16 @@ <h1 class="modulename">
108108
<summary>View Source</summary>
109109
<div class="pdoc-code codehilite"><pre><span></span><span id="main-13"><a href="#main-13"><span class="linenos">13</span></a><span class="k">def</span> <span class="nf">main</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="nb">int</span><span class="p">:</span>
110110
</span><span id="main-14"><a href="#main-14"><span class="linenos">14</span></a> <span class="n">parser</span> <span class="o">=</span> <span class="n">argparse</span><span class="o">.</span><span class="n">ArgumentParser</span><span class="p">(</span><span class="n">description</span><span class="o">=</span><span class="s2">&quot;Render .py or .ipynb to .html by executing in Jupyter&quot;</span><span class="p">)</span>
111-
</span><span id="main-15"><a href="#main-15"><span class="linenos">15</span></a> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s1">&#39;infile&#39;</span><span class="p">,</span> <span class="n">metavar</span><span class="o">=</span><span class="s1">&#39;infile&#39;</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="nb">str</span><span class="p">,</span> <span class="n">nargs</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
112-
</span><span id="main-16"><a href="#main-16"><span class="linenos">16</span></a> <span class="n">help</span><span class="o">=</span><span class="s1">&#39;name of input file&#39;</span><span class="p">)</span>
111+
</span><span id="main-15"><a href="#main-15"><span class="linenos">15</span></a> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s1">&#39;infile&#39;</span><span class="p">,</span> <span class="n">metavar</span><span class="o">=</span><span class="s1">&#39;infile&#39;</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="nb">str</span><span class="p">,</span> <span class="n">nargs</span><span class="o">=</span><span class="s1">&#39;+&#39;</span><span class="p">,</span>
112+
</span><span id="main-16"><a href="#main-16"><span class="linenos">16</span></a> <span class="n">help</span><span class="o">=</span><span class="s1">&#39;name of input file(s)&#39;</span><span class="p">)</span>
113113
</span><span id="main-17"><a href="#main-17"><span class="linenos">17</span></a> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s1">&#39;--strip_input&#39;</span><span class="p">,</span> <span class="n">action</span><span class="o">=</span><span class="s1">&#39;store_true&#39;</span><span class="p">)</span>
114114
</span><span id="main-18"><a href="#main-18"><span class="linenos">18</span></a> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s1">&#39;--quiet&#39;</span><span class="p">,</span> <span class="n">action</span><span class="o">=</span><span class="s1">&#39;store_true&#39;</span><span class="p">)</span>
115115
</span><span id="main-19"><a href="#main-19"><span class="linenos">19</span></a> <span class="n">args</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="n">parse_args</span><span class="p">()</span>
116-
</span><span id="main-20"><a href="#main-20"><span class="linenos">20</span></a> <span class="k">assert</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="o">.</span><span class="n">infile</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span>
117-
</span><span id="main-21"><a href="#main-21"><span class="linenos">21</span></a> <span class="n">input_file_name</span> <span class="o">=</span> <span class="n">args</span><span class="o">.</span><span class="n">infile</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
118-
</span><span id="main-22"><a href="#main-22"><span class="linenos">22</span></a> <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">,</span> <span class="nb">str</span><span class="p">)</span>
119-
</span><span id="main-23"><a href="#main-23"><span class="linenos">23</span></a> <span class="k">assert</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">)</span>
120-
</span><span id="main-24"><a href="#main-24"><span class="linenos">24</span></a> <span class="n">render_as_html</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">,</span> <span class="n">exclude_input</span><span class="o">=</span><span class="n">args</span><span class="o">.</span><span class="n">strip_input</span><span class="p">,</span> <span class="n">verbose</span><span class="o">=</span><span class="n">args</span><span class="o">.</span><span class="n">quiet</span> <span class="o">==</span> <span class="kc">False</span><span class="p">)</span>
116+
</span><span id="main-20"><a href="#main-20"><span class="linenos">20</span></a> <span class="k">assert</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="o">.</span><span class="n">infile</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">0</span>
117+
</span><span id="main-21"><a href="#main-21"><span class="linenos">21</span></a> <span class="k">for</span> <span class="n">input_file_name</span> <span class="ow">in</span> <span class="n">args</span><span class="o">.</span><span class="n">infile</span><span class="p">:</span>
118+
</span><span id="main-22"><a href="#main-22"><span class="linenos">22</span></a> <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">,</span> <span class="nb">str</span><span class="p">)</span>
119+
</span><span id="main-23"><a href="#main-23"><span class="linenos">23</span></a> <span class="k">assert</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">)</span>
120+
</span><span id="main-24"><a href="#main-24"><span class="linenos">24</span></a> <span class="n">render_as_html</span><span class="p">(</span><span class="n">input_file_name</span><span class="p">,</span> <span class="n">exclude_input</span><span class="o">=</span><span class="n">args</span><span class="o">.</span><span class="n">strip_input</span><span class="p">,</span> <span class="n">verbose</span><span class="o">=</span><span class="n">args</span><span class="o">.</span><span class="n">quiet</span> <span class="o">==</span> <span class="kc">False</span><span class="p">)</span>
121121
</span><span id="main-25"><a href="#main-25"><span class="linenos">25</span></a> <span class="k">return</span> <span class="mi">0</span>
122122
</span></pre></div>
123123

pkg/wvpy.egg-info/SOURCES.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ MANIFEST.in
44
README.txt
55
setup.py
66
Doc/documentation.txt
7+
docs/index.html
8+
docs/search.js
9+
docs/wvpy.html
10+
docs/wvpy/jtools.html
11+
docs/wvpy/pysheet.html
12+
docs/wvpy/render_workbook.html
13+
docs/wvpy/util.html
714
tests/__init__.py
815
tests/example_bad_notebook.ipynb
916
tests/example_good_notebook.ipynb

pkg/wvpy/render_workbook.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212

1313
def main() -> int:
1414
parser = argparse.ArgumentParser(description="Render .py or .ipynb to .html by executing in Jupyter")
15-
parser.add_argument('infile', metavar='infile', type=str, nargs=1,
16-
help='name of input file')
15+
parser.add_argument('infile', metavar='infile', type=str, nargs='+',
16+
help='name of input file(s)')
1717
parser.add_argument('--strip_input', action='store_true')
1818
parser.add_argument('--quiet', action='store_true')
1919
args = parser.parse_args()
20-
assert len(args.infile) == 1
21-
input_file_name = args.infile[0]
22-
assert isinstance(input_file_name, str)
23-
assert os.path.exists(input_file_name)
24-
render_as_html(input_file_name, exclude_input=args.strip_input, verbose=args.quiet == False)
20+
assert len(args.infile) > 0
21+
for input_file_name in args.infile:
22+
assert isinstance(input_file_name, str)
23+
assert os.path.exists(input_file_name)
24+
render_as_html(input_file_name, exclude_input=args.strip_input, verbose=args.quiet == False)
2525
return 0
2626

2727

0 commit comments

Comments
 (0)