From dd209d18e0278b0bac6f2d97c7e958b007c8faf5 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Sat, 10 Oct 2020 20:04:10 +0000 Subject: [PATCH 1/4] Format nbconvertBaseTemplateFormat --- src/client/datascience/jupyter/jupyterImporter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/datascience/jupyter/jupyterImporter.ts b/src/client/datascience/jupyter/jupyterImporter.ts index 8905f270960b..ea74f25329d5 100644 --- a/src/client/datascience/jupyter/jupyterImporter.ts +++ b/src/client/datascience/jupyter/jupyterImporter.ts @@ -36,7 +36,7 @@ export class JupyterImporter implements INotebookImporter { {% endblock codecell %} {% block in_prompt %}{% endblock in_prompt %} {% block input %}{{ cell.source | ipython2python }}{% endblock input %} -{% block markdowncell scoped %}{0} [markdown] +{% block markdowncell scoped %}{1} [markdown] {{ cell.source | comment_lines }} {% endblock markdowncell %}`; private readonly nbconvert5Null = 'null.tpl'; @@ -53,7 +53,7 @@ export class JupyterImporter implements INotebookImporter { @inject(INbConvertInterpreterDependencyChecker) private readonly nbConvertDependencyChecker: INbConvertInterpreterDependencyChecker, @inject(INbConvertExportToPythonService) private readonly exportToPythonService: INbConvertExportToPythonService - ) {} + ) { } public async importFromFile(sourceFile: Uri, interpreter: PythonEnvironment): Promise { // If the user has requested it, add a cd command to the imported file so that relative paths still work From bb440775c34d5eb0a3caf7e3f6a4cc628e94111b Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Sat, 10 Oct 2020 20:10:24 +0000 Subject: [PATCH 2/4] Hygiene --- src/client/datascience/jupyter/jupyterImporter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/datascience/jupyter/jupyterImporter.ts b/src/client/datascience/jupyter/jupyterImporter.ts index ea74f25329d5..0379597a435c 100644 --- a/src/client/datascience/jupyter/jupyterImporter.ts +++ b/src/client/datascience/jupyter/jupyterImporter.ts @@ -53,7 +53,7 @@ export class JupyterImporter implements INotebookImporter { @inject(INbConvertInterpreterDependencyChecker) private readonly nbConvertDependencyChecker: INbConvertInterpreterDependencyChecker, @inject(INbConvertExportToPythonService) private readonly exportToPythonService: INbConvertExportToPythonService - ) { } + ) {} public async importFromFile(sourceFile: Uri, interpreter: PythonEnvironment): Promise { // If the user has requested it, add a cd command to the imported file so that relative paths still work From 4d72479e3ec6d94f380005ed9f3fd3c94d3910d3 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Sat, 10 Oct 2020 20:15:51 +0000 Subject: [PATCH 3/4] Add news --- news/2 Fixes/14359.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/2 Fixes/14359.md diff --git a/news/2 Fixes/14359.md b/news/2 Fixes/14359.md new file mode 100644 index 000000000000..ba468fa780d4 --- /dev/null +++ b/news/2 Fixes/14359.md @@ -0,0 +1 @@ +Fix markdown cell marker when exporting a notebook to a Python script. \ No newline at end of file From 6874d24a46565d70f90b088e6c9f0aeb9d387dd4 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Mon, 12 Oct 2020 10:07:40 -0700 Subject: [PATCH 4/4] Update test --- src/test/datascience/notebook.functional.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/datascience/notebook.functional.test.ts b/src/test/datascience/notebook.functional.test.ts index c940df7cead2..ee69ae92276a 100644 --- a/src/test/datascience/notebook.functional.test.ts +++ b/src/test/datascience/notebook.functional.test.ts @@ -676,6 +676,7 @@ suite('DataScience notebook tests', () => { // Make sure we have a cell in our results assert.ok(/#\s*%%/.test(results), 'No cells in returned import'); + assert.ok(!results.includes('tpl'), 'Formatted template with wrong arguments'); } finally { try { importer.dispose();