Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated zmq imports #915

Merged
merged 4 commits into from
Jan 13, 2023
Merged

Remove deprecated zmq imports #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c33d120
remove deprecated imports
blink1073 Jan 12, 2023
52c7bf6
try upper bound on ipykernel
blink1073 Jan 13, 2023
01243dc
fix test
blink1073 Jan 13, 2023
15d29bb
do not install pyqt5
blink1073 Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/downstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jupyter_client/ioloop/restarter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def _loop_default(self):
DeprecationWarning,
stacklevel=4,
)
from zmq.eventloop import ioloop
from tornado import ioloop

return ioloop.IOLoop.current()

Expand Down
2 changes: 1 addition & 1 deletion jupyter_client/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
from typing import Optional, Union

import zmq.asyncio
from tornado.ioloop import IOLoop
from traitlets import (
Any,
Bool,
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/test_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down