update test dependencies

- add pytest-asyncio
- remove mock (only needed for py2)

Author: minrk

.gitignore

@@ -22,3 +22,4 @@ __pycache__
 *coverage.xml
 .coverage.*
 .idea
+htmlcov

ipyparallel/tests/test_apps.py

@@ -2,6 +2,9 @@
 import sys
 import types
 from subprocess import check_output
+from unittest.mock import create_autospec
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 import zmq
 from ipykernel import iostream
@@ -13,11 +16,6 @@
 from ipyparallel.apps import ipengineapp
 from ipyparallel.util import ioloop
 
-try:
-    from unittest.mock import patch, MagicMock, create_autospec
-except ImportError:  # py2
-    from mock import patch, MagicMock, create_autospec
-
 
 def _get_output(cmd):
     out = check_output([sys.executable, '-m', 'ipyparallel.cluster', '--version'])

ipyparallel/tests/test_client.py

@@ -10,22 +10,23 @@
 from concurrent.futures import Future
 from datetime import datetime
 from threading import Thread
-
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import pytest
 import tornado
-
 from IPython import get_ipython
+
+from .clienttest import add_engines
+from .clienttest import ClusterTestCase
+from .clienttest import skip_without
+from .clienttest import wait
+from ipyparallel import AsyncHubResult
+from ipyparallel import DirectView
+from ipyparallel import error
+from ipyparallel import Reference
 from ipyparallel.client import client as clientmod
-from ipyparallel import error, AsyncHubResult, DirectView, Reference
 from ipyparallel.util import utc
 
-from .clienttest import ClusterTestCase, wait, add_engines, skip_without
-
 
 @pytest.mark.usefixtures('ipython')
 class TestClient(ClusterTestCase):

ipyparallel/tests/test_joblib.py

@@ -1,12 +1,10 @@
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import pytest
 
 import ipyparallel as ipp
-from .clienttest import ClusterTestCase, add_engines
+from .clienttest import add_engines
+from .clienttest import ClusterTestCase
 
 try:
     import joblib

ipyparallel/tests/test_util.py

@@ -1,11 +1,10 @@
 import socket
+from unittest import mock
+
+from jupyter_client.localinterfaces import localhost
+from jupyter_client.localinterfaces import public_ips
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 from ipyparallel import util
-from jupyter_client.localinterfaces import localhost, public_ips
 
 
 @mock.patch('warnings.warn')

setup.py

@@ -116,7 +116,7 @@ def run(self):
     install_requires=[
         "ipython_genutils",
         "decorator",
-        "pyzmq>=13",
+        "pyzmq>=18",
         "traitlets>=4.3",
         "ipython>=4",
         "jupyter_client",
@@ -128,7 +128,7 @@ def run(self):
     python_requires=">=3.6",
     extras_require={
         "nbext": ["notebook"],
-        "test": ["pytest", "pytest-cov", "ipython[test]", "testpath", "mock"],
+        "test": ["pytest", "pytest-cov", "pytest-asyncio", "ipython[test]", "testpath"],
     },
     entry_points={
         "console_scripts": [