Fix imports (#23)

Author: blink1073

README.md

@@ -40,6 +40,10 @@ The `pytest_jupyter.jupyter_client` plugin provides an installed
 that provides a factory function that starts a kernel using the `echo` kernel
 by default.
 
+Note: The server plugin also includes the client plugin, so you can use both
+sets of fixtures with `"pytest_jupyter.jupyter_server"`.  Both the `client`
+and `server` plugins also include the core fixtures.
+
 The server fixures use the echo kernel by default.  To override this behavior,
 override the `jp_server_config` fixture and add the following config:
 

pyproject.toml

@@ -43,6 +43,7 @@ client = [
 server = [
     "jupyter_server>=1.21",
     "nbformat>=5.3",
+    "pytest-jupyter[client]",
     "pytest-tornasync>=0.6"
 ]
 test = [

pytest_jupyter/jupyter_client.py

@@ -22,6 +22,8 @@
         "you need. Try: `pip install 'pytest-jupyter[client]'`"
     )
 
+from pytest_jupyter import *  # noqa
+
 try:
     import resource
 except ImportError:

pytest_jupyter/jupyter_server.py

@@ -45,11 +45,10 @@
     )
 
 
-from .jupyter_client import echo_kernel_spec  # noqa
-from .utils import mkdir
+from pytest_jupyter.utils import mkdir
 
 # List of dependencies needed for this plugin.
-pytest_plugins = ["pytest_tornasync", "pytest_jupyter"]
+pytest_plugins = ["pytest_tornasync", "pytest_jupyter.jupyter_client"]
 
 
 @pytest.fixture