Tweak %delimiter output; fix CI errors

hugetim · hugetim · commit c7761689890e · 2023-02-08T15:44:14.000-06:00
diff --git a/manual_test_nbs/delimit tests.ipynb b/manual_test_nbs/delimit tests.ipynb
@@ -100,7 +100,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Stata command delimiter: ;\n"
+      "Current Stata command delimiter: ;\n"
      ]
     }
    ],
diff --git a/manual_test_nbs/stata_kernel example.ipynb b/manual_test_nbs/stata_kernel example.ipynb
@@ -148,9 +148,7 @@
    "cell_type": "code",
    "execution_count": 4,
    "metadata": {
-    "collapsed": true,
     "jupyter": {
-     "outputs_hidden": true,
      "source_hidden": true
     },
     "tags": []
@@ -178,7 +176,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "(highschool and beyond (200 cases))\n"
+      "  (highschool and beyond (200 cases))"
      ]
     },
     {
@@ -264,15 +262,7 @@
    "cell_type": "code",
    "execution_count": 8,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "display \"$S\""
    ]
@@ -437,7 +427,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "b31927a674394df3b93aad51956aa952",
+       "model_id": "47aaaecae10f48ccbe6bac04cb13be7d",
        "version_major": 2,
        "version_minor": 0
       },
@@ -797,7 +787,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Stata command delimiter: ;\n"
+      "Current Stata command delimiter: ;\n"
      ]
     }
    ],
@@ -830,7 +820,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Stata command delimiter: cr\n"
+      "Current Stata command delimiter: cr\n"
      ]
     }
    ],
diff --git a/nbs/02_stata.ipynb b/nbs/02_stata.ipynb
@@ -79,7 +79,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "7a4433a6",
+   "id": "56f636bc",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -90,7 +90,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "39a30389",
+   "id": "f24dac9d",
    "metadata": {},
    "source": [
     "## Simple wrappers"
@@ -162,7 +162,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "a6db616b",
+   "id": "3b2c0c93",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -174,7 +174,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "eceb995b",
+   "id": "5e6e3219",
    "metadata": {},
    "source": [
     "[https://www.stata.com/python/api17/Scalar.html?highlight=scalar#sfi.Scalar.getValue](https://www.stata.com/python/api17/Scalar.html?highlight=scalar#sfi.Scalar.getValue)"
@@ -225,7 +225,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "a3867502",
+   "id": "88740d45",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -390,7 +390,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "e31c7524",
+   "id": "08449ea8",
    "metadata": {},
    "source": [
     "## Running arbitrary Stata code"
@@ -420,7 +420,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "405879dd",
+   "id": "e4a17042",
    "metadata": {},
    "outputs": [
     {
@@ -447,7 +447,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "1048c596",
+   "id": "bef9908c",
    "metadata": {},
    "source": [
     "#| hide\n",
@@ -457,7 +457,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "c2040883",
+   "id": "f7dd200c",
    "metadata": {},
    "outputs": [
     {
@@ -483,7 +483,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "7bd2a424",
+   "id": "7e5c7ae4",
    "metadata": {},
    "outputs": [
     {
@@ -592,7 +592,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "3226d719",
+   "id": "586a6f43",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -611,13 +611,14 @@
      "output_type": "stream",
      "text": [
       "0\n",
-      "Elapsed time: 0.0001 seconds\n",
+      "Elapsed time: 0.0002 seconds\n",
       "0\n",
-      "Elapsed time: 0.0542 seconds\n"
+      "Elapsed time: 0.0508 seconds\n"
      ]
     }
    ],
    "source": [
+    "#| eval: False\n",
     "with Timer():\n",
     "    sfi.SFIToolkit.stata(\"disp 0\")\n",
     "with Timer():\n",
diff --git a/nbs/03_stata_more.ipynb b/nbs/03_stata_more.ipynb
@@ -74,11 +74,12 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "b334caf2",
+   "id": "fc8944c8",
    "metadata": {},
    "outputs": [],
    "source": [
     "#| hide\n",
+    "#| eval: false\n",
     "launch_stata(splash=False)"
    ]
   },
@@ -131,7 +132,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "3f8d9b03",
+   "id": "517eb526",
    "metadata": {},
    "source": [
     "When given multi-line Stata code, `run_direct` outputs an extra blank line at the start and two extra lines at the end:"
@@ -140,7 +141,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "c6c4ea9d",
+   "id": "77268cd8",
    "metadata": {},
    "outputs": [
     {
@@ -161,7 +162,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "155d2ca1",
+   "id": "d1a2c35b",
    "metadata": {},
    "outputs": [
     {
@@ -188,7 +189,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "38bb82ed",
+   "id": "23f3c302",
    "metadata": {},
    "source": [
     "We can clean it up like this:"
@@ -197,7 +198,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "b4c4e593",
+   "id": "7f87219b",
    "metadata": {},
    "outputs": [
     {
@@ -225,7 +226,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "d804ecbc",
+   "id": "e2260b0f",
    "metadata": {},
    "outputs": [
     {
@@ -250,7 +251,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "d781c72d",
+   "id": "4ad19471",
    "metadata": {},
    "outputs": [
     {
@@ -276,7 +277,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "02ce82dd",
+   "id": "ae387622",
    "metadata": {},
    "outputs": [
     {
@@ -299,7 +300,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "bda8ab3c",
+   "id": "7b375dbe",
    "metadata": {},
    "outputs": [
     {
@@ -327,7 +328,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "63341d17",
+   "id": "3257de50",
    "metadata": {},
    "source": [
     "`run_direct_cleaned` also removes the blank line output by `run_direct` with `quietly=True`"
@@ -384,7 +385,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "751c8512",
+   "id": "66e02d03",
    "metadata": {},
    "source": [
     "#| hide\n",
@@ -418,7 +419,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "06251617",
+   "id": "5824a58d",
    "metadata": {},
    "source": [
     "Note however that `run_direct_cleaned` delays text output until the code finishes running:"
@@ -427,7 +428,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "b565bd11",
+   "id": "c8ac57b9",
    "metadata": {},
    "outputs": [
     {
@@ -458,7 +459,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "beb13406",
+   "id": "8dc90cca",
    "metadata": {},
    "source": [
     "`run_direct_cleaned` may also misalign text output relative to graph output:"
@@ -467,7 +468,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "cd6d40b0",
+   "id": "1ede5ddb",
    "metadata": {},
    "outputs": [
     {
@@ -797,7 +798,7 @@
      "text": [
       "var1      __000001\n",
       "var1\n",
-      "Elapsed time: 0.0009 seconds\n"
+      "Elapsed time: 0.0005 seconds\n"
      ]
     }
    ],
@@ -1317,8 +1318,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Elapsed time: 0.1911 seconds\n",
-      "Elapsed time: 0.0929 seconds\n"
+      "Elapsed time: 0.2083 seconds\n",
+      "Elapsed time: 0.0912 seconds\n"
      ]
     }
    ],
@@ -1341,7 +1342,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Elapsed time: 0.2876 seconds\n"
+      "Elapsed time: 0.3145 seconds\n"
      ]
     }
    ],
@@ -1650,8 +1651,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Elapsed time: 0.0012 seconds\n",
-      "Elapsed time: 0.2409 seconds\n"
+      "Elapsed time: 0.0011 seconds\n",
+      "Elapsed time: 0.2424 seconds\n"
      ]
     }
    ],
diff --git a/nbs/09_magics.ipynb b/nbs/09_magics.ipynb
@@ -113,7 +113,7 @@
     "    \n",
     "    def magic_delimit(self, code, kernel, cell):\n",
     "        delim = ';' if kernel.stata_session.sc_delimiter else 'cr'\n",
-    "        print_kernel(f'Stata command delimiter: {delim}', kernel)\n",
+    "        print_kernel(f'Current Stata command delimiter: {delim}', kernel)\n",
     "        return ''"
    ]
   },
diff --git a/nbstata/magics.py b/nbstata/magics.py
@@ -65,7 +65,7 @@ def magic_echo(self, code, kernel, cell):
     
     def magic_delimit(self, code, kernel, cell):
         delim = ';' if kernel.stata_session.sc_delimiter else 'cr'
-        print_kernel(f'Stata command delimiter: {delim}', kernel)
+        print_kernel(f'Current Stata command delimiter: {delim}', kernel)
         return ''
 
 # %% ../nbs/09_magics.ipynb 6

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@`
`100`	`100`	`"name": "stdout",`
`101`	`101`	`"output_type": "stream",`
`102`	`102`	`"text": [`
`103`		`- "Stata command delimiter: ;\n"`
	`103`	`+ "Current Stata command delimiter: ;\n"`
`104`	`104`	`]`
`105`	`105`	`}`
`106`	`106`	`],`
Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,12 @@`
`74`	`74`	`{`
`75`	`75`	`"cell_type": "code",`
`76`	`76`	`"execution_count": null,`
`77`		`- "id": "b334caf2",`
	`77`	`+ "id": "fc8944c8",`
`78`	`78`	`"metadata": {},`
`79`	`79`	`"outputs": [],`
`80`	`80`	`"source": [`
`81`	`81`	`"#\| hide\n",`
	`82`	`+ "#\| eval: false\n",`
`82`	`83`	`"launch_stata(splash=False)"`
`83`	`84`	`]`
`84`	`85`	`},`
`@@ -131,7 +132,7 @@`
`131`	`132`	`},`
`132`	`133`	`{`
`133`	`134`	`"cell_type": "markdown",`
`134`		`- "id": "3f8d9b03",`
	`135`	`+ "id": "517eb526",`
`135`	`136`	`"metadata": {},`
`136`	`137`	`"source": [`
`137`	`138`	"When given multi-line Stata code, `run_direct` outputs an extra blank line at the start and two extra lines at the end:"
`@@ -140,7 +141,7 @@`
`140`	`141`	`{`
`141`	`142`	`"cell_type": "code",`
`142`	`143`	`"execution_count": null,`
`143`		`- "id": "c6c4ea9d",`
	`144`	`+ "id": "77268cd8",`
`144`	`145`	`"metadata": {},`
`145`	`146`	`"outputs": [`
`146`	`147`	`{`
`@@ -161,7 +162,7 @@`
`161`	`162`	`{`
`162`	`163`	`"cell_type": "code",`
`163`	`164`	`"execution_count": null,`
`164`		`- "id": "155d2ca1",`
	`165`	`+ "id": "d1a2c35b",`
`165`	`166`	`"metadata": {},`
`166`	`167`	`"outputs": [`
`167`	`168`	`{`
`@@ -188,7 +189,7 @@`
`188`	`189`	`},`
`189`	`190`	`{`
`190`	`191`	`"cell_type": "markdown",`
`191`		`- "id": "38bb82ed",`
	`192`	`+ "id": "23f3c302",`
`192`	`193`	`"metadata": {},`
`193`	`194`	`"source": [`
`194`	`195`	`"We can clean it up like this:"`
`@@ -197,7 +198,7 @@`
`197`	`198`	`{`
`198`	`199`	`"cell_type": "code",`
`199`	`200`	`"execution_count": null,`
`200`		`- "id": "b4c4e593",`
	`201`	`+ "id": "7f87219b",`
`201`	`202`	`"metadata": {},`
`202`	`203`	`"outputs": [`
`203`	`204`	`{`
`@@ -225,7 +226,7 @@`
`225`	`226`	`{`
`226`	`227`	`"cell_type": "code",`
`227`	`228`	`"execution_count": null,`
`228`		`- "id": "d804ecbc",`
	`229`	`+ "id": "e2260b0f",`
`229`	`230`	`"metadata": {},`
`230`	`231`	`"outputs": [`
`231`	`232`	`{`
`@@ -250,7 +251,7 @@`
`250`	`251`	`{`
`251`	`252`	`"cell_type": "code",`
`252`	`253`	`"execution_count": null,`
`253`		`- "id": "d781c72d",`
	`254`	`+ "id": "4ad19471",`
`254`	`255`	`"metadata": {},`
`255`	`256`	`"outputs": [`
`256`	`257`	`{`
`@@ -276,7 +277,7 @@`
`276`	`277`	`{`
`277`	`278`	`"cell_type": "code",`
`278`	`279`	`"execution_count": null,`
`279`		`- "id": "02ce82dd",`
	`280`	`+ "id": "ae387622",`
`280`	`281`	`"metadata": {},`
`281`	`282`	`"outputs": [`
`282`	`283`	`{`
`@@ -299,7 +300,7 @@`
`299`	`300`	`{`
`300`	`301`	`"cell_type": "code",`
`301`	`302`	`"execution_count": null,`
`302`		`- "id": "bda8ab3c",`
	`303`	`+ "id": "7b375dbe",`
`303`	`304`	`"metadata": {},`
`304`	`305`	`"outputs": [`
`305`	`306`	`{`
`@@ -327,7 +328,7 @@`
`327`	`328`	`},`
`328`	`329`	`{`
`329`	`330`	`"cell_type": "markdown",`
`330`		`- "id": "63341d17",`
	`331`	`+ "id": "3257de50",`
`331`	`332`	`"metadata": {},`
`332`	`333`	`"source": [`
`333`	`334`	"`run_direct_cleaned` also removes the blank line output by `run_direct` with `quietly=True`"
`@@ -384,7 +385,7 @@`
`384`	`385`	`},`
`385`	`386`	`{`
`386`	`387`	`"cell_type": "markdown",`
`387`		`- "id": "751c8512",`
	`388`	`+ "id": "66e02d03",`
`388`	`389`	`"metadata": {},`
`389`	`390`	`"source": [`
`390`	`391`	`"#\| hide\n",`
`@@ -418,7 +419,7 @@`
`418`	`419`	`},`
`419`	`420`	`{`
`420`	`421`	`"cell_type": "markdown",`
`421`		`- "id": "06251617",`
	`422`	`+ "id": "5824a58d",`
`422`	`423`	`"metadata": {},`
`423`	`424`	`"source": [`
`424`	`425`	"Note however that `run_direct_cleaned` delays text output until the code finishes running:"
`@@ -427,7 +428,7 @@`
`427`	`428`	`{`
`428`	`429`	`"cell_type": "code",`
`429`	`430`	`"execution_count": null,`
`430`		`- "id": "b565bd11",`
	`431`	`+ "id": "c8ac57b9",`
`431`	`432`	`"metadata": {},`
`432`	`433`	`"outputs": [`
`433`	`434`	`{`
`@@ -458,7 +459,7 @@`
`458`	`459`	`},`
`459`	`460`	`{`
`460`	`461`	`"cell_type": "markdown",`
`461`		`- "id": "beb13406",`
	`462`	`+ "id": "8dc90cca",`
`462`	`463`	`"metadata": {},`
`463`	`464`	`"source": [`
`464`	`465`	"`run_direct_cleaned` may also misalign text output relative to graph output:"
`@@ -467,7 +468,7 @@`
`467`	`468`	`{`
`468`	`469`	`"cell_type": "code",`
`469`	`470`	`"execution_count": null,`
`470`		`- "id": "cd6d40b0",`
	`471`	`+ "id": "1ede5ddb",`
`471`	`472`	`"metadata": {},`
`472`	`473`	`"outputs": [`
`473`	`474`	`{`
`@@ -797,7 +798,7 @@`
`797`	`798`	`"text": [`
`798`	`799`	`"var1 __000001\n",`
`799`	`800`	`"var1\n",`
`800`		`- "Elapsed time: 0.0009 seconds\n"`
	`801`	`+ "Elapsed time: 0.0005 seconds\n"`
`801`	`802`	`]`
`802`	`803`	`}`
`803`	`804`	`],`
`@@ -1317,8 +1318,8 @@`
`1317`	`1318`	`"name": "stdout",`
`1318`	`1319`	`"output_type": "stream",`
`1319`	`1320`	`"text": [`
`1320`		`- "Elapsed time: 0.1911 seconds\n",`
`1321`		`- "Elapsed time: 0.0929 seconds\n"`
	`1321`	`+ "Elapsed time: 0.2083 seconds\n",`
	`1322`	`+ "Elapsed time: 0.0912 seconds\n"`
`1322`	`1323`	`]`
`1323`	`1324`	`}`
`1324`	`1325`	`],`
`@@ -1341,7 +1342,7 @@`
`1341`	`1342`	`"name": "stdout",`
`1342`	`1343`	`"output_type": "stream",`
`1343`	`1344`	`"text": [`
`1344`		`- "Elapsed time: 0.2876 seconds\n"`
	`1345`	`+ "Elapsed time: 0.3145 seconds\n"`
`1345`	`1346`	`]`
`1346`	`1347`	`}`
`1347`	`1348`	`],`
`@@ -1650,8 +1651,8 @@`
`1650`	`1651`	`"name": "stdout",`
`1651`	`1652`	`"output_type": "stream",`
`1652`	`1653`	`"text": [`
`1653`		`- "Elapsed time: 0.0012 seconds\n",`
`1654`		`- "Elapsed time: 0.2409 seconds\n"`
	`1654`	`+ "Elapsed time: 0.0011 seconds\n",`
	`1655`	`+ "Elapsed time: 0.2424 seconds\n"`
`1655`	`1656`	`]`
`1656`	`1657`	`}`
`1657`	`1658`	`],`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@`
`113`	`113`	`" \n",`
`114`	`114`	`" def magic_delimit(self, code, kernel, cell):\n",`
`115`	`115`	`" delim = ';' if kernel.stata_session.sc_delimiter else 'cr'\n",`
`116`		`- " print_kernel(f'Stata command delimiter: {delim}', kernel)\n",`
	`116`	`+ " print_kernel(f'Current Stata command delimiter: {delim}', kernel)\n",`
`117`	`117`	`" return ''"`
`118`	`118`	`]`
`119`	`119`	`},`