Merge pull request #902 from blink1073/fix-cell-id

Author: blink1073

ipykernel/inprocess/tests/test_kernel.py

@@ -1,6 +1,7 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import asyncio
 import sys
 import unittest
 from contextlib import contextmanager
@@ -148,3 +149,8 @@ def test_getpass_stream(self):
         kernel._input_request = lambda *args, **kwargs: None
 
         kernel.getpass(stream="non empty")
+
+    def test_do_execute(self):
+        kernel = InProcessKernel()
+        asyncio.run(kernel.do_execute("a=1", True))
+        assert kernel.shell.user_ns["a"] == 1

ipykernel/ipkernel.py

@@ -304,7 +304,7 @@ async def do_execute(
         user_expressions=None,
         allow_stdin=False,
         *,
-        cell_id,
+        cell_id=None,
     ):
         shell = self.shell  # we'll need this a lot here
 

ipykernel/kernelbase.py

@@ -749,7 +749,14 @@ async def execute_request(self, stream, ident, parent):
             self._abort_queues()
 
     def do_execute(
-        self, code, silent, store_history=True, user_expressions=None, allow_stdin=False
+        self,
+        code,
+        silent,
+        store_history=True,
+        user_expressions=None,
+        allow_stdin=False,
+        *,
+        cell_id=None,
     ):
         """Execute user code. Must be overridden by subclasses."""
         raise NotImplementedError

pyproject.toml

@@ -30,9 +30,9 @@ tag_template = "v{new_version}"
 src = "ipykernel/_version.py"
 
 [tool.pytest.ini_options]
-addopts = "-raXs --durations 10 --color=yes --doctest-modules"
+addopts = "-raXs --durations 10 --color=yes --doctest-modules --ignore=ipykernel/pylab/backend_inline.py --ignore=ipykernel/pylab/config.py --ignore=ipykernel/gui/gtk3embed.py --ignore=ipykernel/gui/gtkembed.py --ignore=ipykernel/datapub.py --ignore=ipykernel/log.py --ignore=ipykernel/pickleutil.py --ignore=ipykernel/serialize.py --ignore=ipykernel/_eventloop_macos.py"
 testpaths = [
-    "ipykernel/tests/"
+    "ipykernel/"
 ]
 timeout = 300
 # Restore this setting to debug failures
@@ -41,6 +41,12 @@ filterwarnings= [
   # Fail on warnings
   "error",
 
+  # Ignore our own warnings
+  "ignore:The `stream` parameter of `getpass.getpass` will have no effect:UserWarning",
+
+  # https://github.com/minrk/appnope/issues/13
+  "ignore:distutils Version classes are deprecated:DeprecationWarning:appnope",
+
   # Ignore jupyter_client warnings
   "ignore:unclosed <socket.socket:ResourceWarning",
   "ignore:unclosed event loop:ResourceWarning",

setup.py

@@ -81,6 +81,8 @@ def run(self):
             "ipyparallel",
             "pre-commit",
             "pytest-timeout",
+            "gobject",
+            "trio",
         ],
     },
     classifiers=[