Skip to content

Commit fe6cee3

Browse files
authored
Merge pull request #226 from minrk/deprecated-pyzmq-install
remove call to deprecated pyzmq ioloop.install
2 parents 9755840 + cd11a7f commit fe6cee3

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

jupyter_server/serverapp.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@
4141
from jupyter_server.transutils import trans, _
4242
from jupyter_server.utils import secure_write, run_sync
4343

44-
# Install the pyzmq ioloop. This has to be done before anything else from
45-
# tornado is imported.
46-
from zmq.eventloop import ioloop
47-
ioloop.install()
48-
4944
# check for tornado 3.1.0
5045
try:
5146
import tornado
@@ -59,6 +54,7 @@
5954
raise ImportError(_("The Jupyter Server requires tornado >= 4.0, but you have %s") % tornado.version)
6055

6156
from tornado import httpserver
57+
from tornado import ioloop
6258
from tornado import web
6359
from tornado.httputil import url_concat
6460
from tornado.log import LogFormatter, app_log, access_log, gen_log

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@
8181
install_requires = [
8282
'jinja2',
8383
'tornado>=5.0',
84-
# pyzmq>=17 is not technically necessary,
85-
# but hopefully avoids incompatibilities with Tornado 5. April 2018
8684
'pyzmq>=17',
8785
'ipython_genutils',
8886
'traitlets>=4.2.1',

0 commit comments

Comments
 (0)