Merge branch 'main' into pre-commit-ci-update-config

Author: ianthomas23

.github/workflows/ci.yml

@@ -61,7 +61,7 @@ jobs:
       - name: Install hatch
         run: |
           python --version
-          python -m pip install hatch
+          python -m pip install hatch "virtualenv<21"
 
       - name: Run the tests
         timeout-minutes: 15
@@ -104,6 +104,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+
+      - name: Preinstall hatch and virtualenv
+        run: |
+          python --version
+          python -m pip install hatch "virtualenv<21"
+
       - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
       - name: Run Linters
         run: |
@@ -116,7 +122,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+
+      - name: Preinstall hatch and virtualenv
+        run: |
+          python --version
+          python -m pip install hatch "virtualenv<21"
+
       - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+
       - uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -125,7 +138,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+
+      - name: Preinstall hatch and virtualenv
+        run: |
+          python --version
+          python -m pip install hatch "virtualenv<21"
+
       - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+
       - name: Build API docs
         run: |
           hatch run docs:api
@@ -148,6 +168,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Preinstall hatch and virtualenv
+        run: |
+          python --version
+          python -m pip install hatch "virtualenv<21"
+
       - name: Base Setup
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
@@ -170,11 +195,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.10"
+
+      - name: Preinstall hatch and virtualenv
+        run: |
+          python --version
+          python -m pip install hatch "virtualenv<21"
+
       - name: Base Setup
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
         with:
           dependency_type: minimum
-          python_version: "3.10"
+          python_version: ${{ matrix.python-version }}
 
       - name: List installed packages
         run: |
@@ -191,10 +226,17 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
+
+      - name: Preinstall hatch and virtualenv
+        run: |
+          python --version
+          python -m pip install hatch "virtualenv<21"
+
       - name: Base Setup
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
         with:
           dependency_type: pre
+
       - name: Run the tests
         run: |
           hatch run test:nowarn

CHANGELOG.md

@@ -14,7 +14,7 @@
 ### Enhancements made
 
 - Made IOPubThread constructor backward compatible [#1492](https://github.com/ipython/ipykernel/pull/1492) ([@JohanMabille](https://github.com/JohanMabille), [@SylvainCorlay](https://github.com/SylvainCorlay), [@ianthomas23](https://github.com/ianthomas23), [@minrk](https://github.com/minrk))
-- Advertizes kernel protocol 5.5 [#1488](https://github.com/ipython/ipykernel/pull/1488) ([@JohanMabille](https://github.com/JohanMabille), [@ianthomas23](https://github.com/ianthomas23))
+- Advertises kernel protocol 5.5 [#1488](https://github.com/ipython/ipykernel/pull/1488) ([@JohanMabille](https://github.com/JohanMabille), [@ianthomas23](https://github.com/ianthomas23))
 - Upgrade to jupyter_client 8.8.0 [#1487](https://github.com/ipython/ipykernel/pull/1487) ([@JohanMabille](https://github.com/JohanMabille), [@ianthomas23](https://github.com/ianthomas23))
 - Implement kernel-side callstack filtering for internal frames [#1481](https://github.com/ipython/ipykernel/pull/1481) ([@arjxn-py](https://github.com/arjxn-py), [@JohanMabille](https://github.com/JohanMabille), [@ianthomas23](https://github.com/ianthomas23))
 

ipykernel/kernelbase.py

@@ -869,7 +869,7 @@ async def execute_request(self, stream, ident, parent):
             subshell_id = parent["header"].get("subshell_id")
             self._abort_queues(subshell_id)
 
-    def do_execute(
+    async def do_execute(
         self,
         code,
         silent,
@@ -904,7 +904,7 @@ async def complete_request(self, stream, ident, parent):
         matches = json_clean(matches)
         self.session.send(stream, "complete_reply", matches, parent, ident)
 
-    def do_complete(self, code, cursor_pos):
+    async def do_complete(self, code, cursor_pos):
         """Override in subclasses to find completions."""
         return {
             "matches": [],
@@ -940,7 +940,7 @@ async def inspect_request(self, stream, ident, parent):
         msg = self.session.send(stream, "inspect_reply", reply_content, parent, ident)
         self.log.debug("%s", msg)
 
-    def do_inspect(self, code, cursor_pos, detail_level=0, omit_sections=()):
+    async def do_inspect(self, code, cursor_pos, detail_level=0, omit_sections=()):
         """Override in subclasses to allow introspection."""
         return {"status": "ok", "data": {}, "metadata": {}, "found": False}
 
@@ -964,7 +964,7 @@ async def history_request(self, stream, ident, parent):
         msg = self.session.send(stream, "history_reply", reply_content, parent, ident)
         self.log.debug("%s", msg)
 
-    def do_history(
+    async def do_history(
         self,
         hist_access_type,
         output,
@@ -1104,7 +1104,7 @@ async def shutdown_request(self, stream, ident, parent):
             shell_io_loop = self.shell_stream.io_loop
             shell_io_loop.add_callback(shell_io_loop.stop)
 
-    def do_shutdown(self, restart):
+    async def do_shutdown(self, restart):
         """Override in subclasses to do things when the frontend shuts down the
         kernel.
         """
@@ -1130,7 +1130,7 @@ async def is_complete_request(self, stream, ident, parent):
         reply_msg = self.session.send(stream, "is_complete_reply", reply_content, parent, ident)
         self.log.debug("%s", reply_msg)
 
-    def do_is_complete(self, code):
+    async def do_is_complete(self, code):
         """Override in subclasses to find completions."""
         return {"status": "unknown"}