From c33d12062b398c81acbb495c3c7b30818838bdb0 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Thu, 12 Jan 2023 11:38:24 -0600
Subject: [PATCH 1/4] remove deprecated imports

---
 jupyter_client/ioloop/restarter.py | 2 +-
 jupyter_client/session.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jupyter_client/ioloop/restarter.py b/jupyter_client/ioloop/restarter.py
index 92cdeb95..d0c70396 100644
--- a/jupyter_client/ioloop/restarter.py
+++ b/jupyter_client/ioloop/restarter.py
@@ -24,7 +24,7 @@ def _loop_default(self):
             DeprecationWarning,
             stacklevel=4,
         )
-        from zmq.eventloop import ioloop
+        from tornado import ioloop
 
         return ioloop.IOLoop.current()
 
diff --git a/jupyter_client/session.py b/jupyter_client/session.py
index b1e45e60..d2d0164a 100644
--- a/jupyter_client/session.py
+++ b/jupyter_client/session.py
@@ -28,6 +28,7 @@
 from typing import Optional, Union
 
 import zmq.asyncio
+from tornado.ioloop import IOLoop
 from traitlets import (
     Any,
     Bool,
@@ -45,7 +46,6 @@
 from traitlets.config.configurable import Configurable, LoggingConfigurable
 from traitlets.log import get_logger
 from traitlets.utils.importstring import import_item
-from zmq.eventloop.ioloop import IOLoop
 from zmq.eventloop.zmqstream import ZMQStream
 
 from ._version import protocol_version

From 52c7bf6361427b7f2c056f29c723f8b8bbbeddc0 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 13 Jan 2023 08:11:40 -0600
Subject: [PATCH 2/4] try upper bound on ipykernel

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9351d998..a010a8eb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,7 +50,7 @@ Homepage = "https://jupyter.org"
 test = [
     "codecov",
     "coverage",
-    "ipykernel>=6.14",
+    "ipykernel>=6.14,<6.20",
     "mypy",
     "paramiko; sys_platform == 'win32'",
     "pre-commit",

From 01243dcf7ddabb14f820ccbd0cfcfceee941fd93 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 13 Jan 2023 08:31:48 -0600
Subject: [PATCH 3/4] fix test

---
 pyproject.toml        | 2 +-
 tests/test_session.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index a010a8eb..9351d998 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,7 +50,7 @@ Homepage = "https://jupyter.org"
 test = [
     "codecov",
     "coverage",
-    "ipykernel>=6.14,<6.20",
+    "ipykernel>=6.14",
     "mypy",
     "paramiko; sys_platform == 'win32'",
     "pre-commit",
diff --git a/tests/test_session.py b/tests/test_session.py
index b7a84370..e6cec015 100644
--- a/tests/test_session.py
+++ b/tests/test_session.py
@@ -289,7 +289,6 @@ async def test_tracking(self, session):
         s = session
         s.copy_threshold = 1
         loop = ioloop.IOLoop(make_current=False)
-        ZMQStream(a, io_loop=loop)
 
         msg = s.send(a, "hello", track=False)
         self.assertTrue(msg["tracker"] is ss.DONE)

From 15d29bb04d027848ff139a9a3cebb914a686b5b3 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 13 Jan 2023 08:37:09 -0600
Subject: [PATCH 4/4] do not install pyqt5

---
 .github/workflows/downstream.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index edb47d36..f901353a 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -19,7 +19,6 @@ jobs:
       - uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
         with:
           package_name: ipykernel
-          package_spec: "pyqt5 ipykernel[test]"
 
   nbclient:
     runs-on: ubuntu-latest