Skip to content

Commit fab3c33

Browse files
committed
fixes #731
1 parent 26deca8 commit fab3c33

File tree

3 files changed

+30
-20
lines changed

3 files changed

+30
-20
lines changed

nbdev/test.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,14 @@ def nbdev_test(
7979
files = nbglob(fname, recursive=recursive, file_re=file_re, folder_re=folder_re,
8080
skip_file_glob=skip_file_glob, skip_file_re=skip_file_re, as_path=True, symlinks=symlinks)
8181
files = [f.absolute() for f in sorted(files) if _keep_file(f, ignore_fname)]
82-
if len(files)==0:
83-
print('No files were eligible for testing')
84-
return
82+
if len(files)==0: return print('No files were eligible for testing')
83+
8584
if n_workers is None: n_workers = 0 if len(files)==1 else min(num_cpus(), 8)
8685
os.chdir(config_key("nbs_path"))
87-
results = parallel(test_nb, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers, pause=pause, do_print=do_print)
86+
if IN_NOTEBOOK: kwargs = {'method':'spawn'} if os.name=='nt' else {'method':'forkserver'}
87+
else: kwargs = {}
88+
results = parallel(test_nb, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers,
89+
pause=pause, do_print=do_print, **kwargs)
8890
passed,times = zip(*results)
8991
if all(passed): print("Success.")
9092
else:

nbs/14_test.ipynb

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
{
9898
"data": {
9999
"text/plain": [
100-
"0.013420820236206055"
100+
"0.02000713348388672"
101101
]
102102
},
103103
"execution_count": null,
@@ -186,12 +186,14 @@
186186
" files = nbglob(fname, recursive=recursive, file_re=file_re, folder_re=folder_re,\n",
187187
" skip_file_glob=skip_file_glob, skip_file_re=skip_file_re, as_path=True, symlinks=symlinks)\n",
188188
" files = [f.absolute() for f in sorted(files) if _keep_file(f, ignore_fname)]\n",
189-
" if len(files)==0:\n",
190-
" print('No files were eligible for testing')\n",
191-
" return\n",
189+
" if len(files)==0: return print('No files were eligible for testing')\n",
190+
"\n",
192191
" if n_workers is None: n_workers = 0 if len(files)==1 else min(num_cpus(), 8)\n",
193192
" os.chdir(config_key(\"nbs_path\"))\n",
194-
" results = parallel(test_nb, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers, pause=pause, do_print=do_print)\n",
193+
" if IN_NOTEBOOK: kwargs = {'method':'spawn'} if os.name=='nt' else {'method':'forkserver'}\n",
194+
" else: kwargs = {}\n",
195+
" results = parallel(test_nb, files, skip_flags=skip_flags, force_flags=force_flags, n_workers=n_workers,\n",
196+
" pause=pause, do_print=do_print, **kwargs)\n",
195197
" passed,times = zip(*results)\n",
196198
" if all(passed): print(\"Success.\")\n",
197199
" else: \n",
@@ -240,9 +242,9 @@
240242
"name": "stdout",
241243
"output_type": "stream",
242244
"text": [
243-
"Starting /Users/hamel/github/nbdev/nbs/../tests/minimal.ipynb\n",
244-
"- Completed /Users/hamel/github/nbdev/nbs/../tests/minimal.ipynb\n",
245-
"Success.\n"
245+
"Starting /Users/jhoward/git/nbdev/nbs/../tests/minimal.ipynb\r\n",
246+
"- Completed /Users/jhoward/git/nbdev/nbs/../tests/minimal.ipynb\r\n",
247+
"Success.\r\n"
246248
]
247249
}
248250
],
@@ -268,12 +270,10 @@
268270
"name": "stdout",
269271
"output_type": "stream",
270272
"text": [
271-
"Starting /Users/hamel/github/nbdev/nbs/../tests/2020-02-20-test.ipynb\n",
272-
"Starting /Users/hamel/github/nbdev/nbs/../tests/docs_test.ipynb\n",
273-
"Starting /Users/hamel/github/nbdev/nbs/../tests/showdoc_test.ipynb\n",
274-
"- Completed /Users/hamel/github/nbdev/nbs/../tests/showdoc_test.ipynb\n",
275-
"- Completed /Users/hamel/github/nbdev/nbs/../tests/docs_test.ipynb\n",
276-
"- Completed /Users/hamel/github/nbdev/nbs/../tests/2020-02-20-test.ipynb\n",
273+
"Starting /Users/jhoward/git/nbdev/nbs/../tests/docs_test.ipynb\n",
274+
"Starting /Users/jhoward/git/nbdev/nbs/../tests/showdoc_test.ipynb\n",
275+
"- Completed /Users/jhoward/git/nbdev/nbs/../tests/showdoc_test.ipynb\n",
276+
"- Completed /Users/jhoward/git/nbdev/nbs/../tests/docs_test.ipynb\n",
277277
"Success.\n"
278278
]
279279
}
@@ -298,8 +298,7 @@
298298
"outputs": [],
299299
"source": [
300300
"#|hide\n",
301-
"from nbdev.doclinks import nbdev_export\n",
302-
"nbdev_export()"
301+
"import nbdev; nbdev.nbdev_export()"
303302
]
304303
},
305304
{

tests/2020-02-20-test.ipynb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@
1414
"- image: images/chart-preview.png"
1515
]
1616
},
17+
{
18+
"cell_type": "code",
19+
"execution_count": null,
20+
"metadata": {},
21+
"outputs": [],
22+
"source": [
23+
"#| nbflags skip_showdoc skip_exec"
24+
]
25+
},
1726
{
1827
"cell_type": "markdown",
1928
"metadata": {},

0 commit comments

Comments
 (0)