Merge branch 'main' into zmq_anyio

Author: Carreau

pyproject.toml

@@ -132,12 +132,62 @@ build = [
 [tool.mypy]
 files = "ipykernel"
 strict = true
+#disable_error_code = [ "import-not-found"]
 disable_error_code = ["no-untyped-def", "no-untyped-call", "import-not-found"]
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
 follow_imports = "normal"
-pretty = true
+#pretty = true
 warn_unreachable = true
 
+[[tool.mypy.overrides]]
+module = [
+    "ipykernel._eventloop_macos",
+    "ipykernel.comm.comm",
+    "ipykernel.comm.manager",
+    "ipykernel.compiler",
+    "ipykernel.connect",
+    "ipykernel.control",
+    "ipykernel.datapub",
+    "ipykernel.debugger",
+    "ipykernel.displayhook",
+    "ipykernel.embed",
+    "ipykernel.eventloops",
+    "ipykernel.gui.gtk3embed",
+    "ipykernel.gui.gtkembed",
+    "ipykernel.heartbeat",
+    "ipykernel.inprocess.blocking",
+    "ipykernel.inprocess.channels",
+    "ipykernel.inprocess.client",
+    "ipykernel.inprocess.ipkernel",
+    "ipykernel.inprocess.manager",
+    "ipykernel.inprocess.session",
+    "ipykernel.inprocess.socket",
+    "ipykernel.iostream",
+    "ipykernel.ipkernel",
+    "ipykernel.jsonutil",
+    "ipykernel.kernelapp",
+    "ipykernel.kernelbase",
+    "ipykernel.log",
+    "ipykernel.parentpoller",
+    "ipykernel.pickleutil",
+    "ipykernel.serialize",
+    "ipykernel.shellchannel",
+    "ipykernel.subshell",
+    "ipykernel.subshell_manager",
+    "ipykernel.thread",
+    "ipykernel.trio_runner",
+    "ipykernel.zmqshell"
+]
+#check_untyped_defs = false
+#disallow_incomplete_defs = false
+#disallow_untyped_calls = false
+#disallow_untyped_decorators = false
+#disallow_untyped_defs = false
+#ignore_missing_imports = true
+#follow_untyped_imports = false
+
+
+
 [tool.pytest.ini_options]
 minversion = "6.0"
 xfail_strict = true
@@ -174,6 +224,10 @@ filterwarnings= [
   # Ignore jupyter_client warnings
   "module:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning",
 
+  # we do not want to raise on resources warnings, or we will not have a chance to
+  # collect the messages and print the location of the leak
+  "always::ResourceWarning",
+
   # ignore unclosed sqlite in traits
   "ignore:unclosed database in <sqlite3.Connection:ResourceWarning",
 

tests/conftest.py

@@ -1,4 +1,6 @@
 import logging
+import os
+import warnings
 from math import inf
 from threading import Event
 from typing import Any, Callable, no_type_check
@@ -21,6 +23,11 @@
     # Windows
     resource = None  # type:ignore
 
+try:
+    import tracemalloc
+except ModuleNotFoundError:
+    tracemalloc = None
+
 
 pytestmark = pytest.mark.anyio
 
@@ -200,3 +207,38 @@ async def ipkernel(anyio_backend):
         yield kernel
         kernel.destroy()
         ZMQInteractiveShell.clear_instance()
+
+
+@pytest.fixture()
+def tracemalloc_resource_warning(recwarn, N=10):
+    """fixture to enable tracemalloc for a single test, and report the
+    location of the leaked resource
+
+    We cannot only enable tracemalloc, as otherwise it is stopped just after the
+    test, the frame cache is cleared by tracemalloc.stop() and thus the warning
+    printing code get None when doing
+    `tracemalloc.get_object_traceback(r.source)`.
+
+    So we need to both filter the warnings to enable ResourceWarning, and loop
+    through it print the stack before we stop tracemalloc and continue.
+
+    """
+    if tracemalloc is None:
+        yield
+        return
+
+    tracemalloc.start(N)
+    with warnings.catch_warnings():
+        warnings.simplefilter("always", category=ResourceWarning)
+        yield None
+    try:
+        for r in recwarn:
+            if r.category is ResourceWarning and r.source is not None:
+                tb = tracemalloc.get_object_traceback(r.source)
+                if tb:
+                    info = f"Leaking resource:{r}\n |" + "\n |".join(tb.format())
+                    # technically an Error and not a failure as we fail in the fixture
+                    # and not the test
+                    pytest.fail(info)
+    finally:
+        tracemalloc.stop()

tests/test_connect.py

@@ -19,21 +19,6 @@
 
 from .utils import TemporaryWorkingDirectory
 
-
-@pytest.fixture(scope="module", autouse=True)
-def _enable_tracemalloc():
-    try:
-        import tracemalloc
-    except ModuleNotFoundError:
-        # pypy
-        tracemalloc = None
-    if tracemalloc is not None:
-        tracemalloc.start()
-    yield
-    if tracemalloc is not None:
-        tracemalloc.stop()
-
-
 sample_info: dict = {
     "ip": "1.2.3.4",
     "transport": "ipc",
@@ -133,7 +118,7 @@ def test_port_bind_failure_recovery(request):
             app.init_sockets()
 
 
-def test_port_bind_failure_gives_up_retries(request):
+def test_port_bind_failure_gives_up_retries(request, tracemalloc_resource_warning):
     cfg = Config()
     with TemporaryWorkingDirectory() as d:
         cfg.ProfileDir.location = d

tests/test_ipkernel_direct.py

@@ -51,7 +51,7 @@ async def test_direct_execute_request_aborting(ipkernel):
     assert reply["content"]["status"] == "aborted"
 
 
-async def test_complete_request(ipkernel):
+async def test_complete_request(ipkernel, tracemalloc_resource_warning):
     reply = await ipkernel.test_shell_message("complete_request", dict(code="hello", cursor_pos=0))
     assert reply["header"]["msg_type"] == "complete_reply"
     ipkernel.use_experimental_completions = False