Merge branch 'main' into zmq_anyio

Author: davidbrochart

.github/workflows/downstream.yml

@@ -38,7 +38,7 @@ jobs:
         uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
         with:
           package_name: ipywidgets
-          test_command: pytest -vv -raXxs -k \"not deprecation_fa_icons and not tooltip_deprecation and not on_submit_deprecation\" -W default --durations 10 --color=yes
+          test_command: pytest -vv -raXxs -W default --durations 10 --color=yes
 
   jupyter_client:
     runs-on: ubuntu-latest
@@ -116,7 +116,7 @@ jobs:
         shell: bash -l {0}
         run: |
           cd ${GITHUB_WORKSPACE}/../qtconsole
-          xvfb-run --auto-servernum ${pythonLocation}/bin/python -m pytest -x -vv -s --full-trace --color=yes qtconsole
+          xvfb-run --auto-servernum ${pythonLocation}/bin/python -m pytest -vv -s --full-trace --color=yes -k "not test_execute" qtconsole
 
   spyder_kernels:
     runs-on: ubuntu-latest
@@ -147,4 +147,4 @@ jobs:
         shell: bash -l {0}
         run: |
           cd ${GITHUB_WORKSPACE}/../spyder-kernels
-          xvfb-run --auto-servernum ${pythonLocation}/bin/python -m pytest -x -vv -s --full-trace --color=yes spyder_kernels
+          xvfb-run --auto-servernum ${pythonLocation}/bin/python -m pytest -vv -s --full-trace --color=yes -k 'not test_interrupt and not test_enter_debug_after_interruption' spyder_kernels

ipykernel/inprocess/client.py

@@ -12,7 +12,7 @@
 # -----------------------------------------------------------------------------
 
 
-from typing import Any
+from typing import Any, Optional
 
 from jupyter_client.client import KernelClient
 from jupyter_client.clientabc import KernelClientABC
@@ -110,8 +110,8 @@ async def execute(  # type:ignore [override]
         code: str,
         silent: bool = False,
         store_history: bool = True,
-        user_expressions: dict[str, Any] | None = None,
-        allow_stdin: bool | None = None,
+        user_expressions: Optional[dict[str, Any]] = None,
+        allow_stdin: Optional[bool] = None,
         stop_on_error: bool = True,
     ) -> str:
         """Execute code on the client."""

tests/test_subshells.py

@@ -218,6 +218,7 @@ def test_run_concurrently_timing(include_main_shell):
         assert duration < timedelta(seconds=sum(times))
 
 
+@pytest.mark.xfail(strict=False, reason="subshell still sometime give different results")
 def test_execution_count():
     with new_kernel() as kc:
         subshell_id = create_subshell_helper(kc)["subshell_id"]