Merge pull request #69 from gnestor/no-running-ipython

Don't load ipython magics unless running ipython is available
heavyai · Jul 3, 2019 · 9c9f7ed · 9c9f7ed
2 parents 8df7469 + 8db4815
commit 9c9f7ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/jupyterlab_omnisci/magics.py b/jupyterlab_omnisci/magics.py
@@ -12,9 +12,16 @@
 
 __all__ = ["OmniSciVegaRenderer", "OmniSciSQLEditorRenderer"]
 
+from IPython import get_ipython
 from IPython.core.magic import register_cell_magic
 from IPython.display import display
 
+# Allow this module to be imported outside of an IPython context
+# by making `register_cell_magic a no-op in that case.
+try:
+    get_ipython()  # noqa
+except:
+    register_cell_magic = lambda x: x
 
 class OmniSciVegaRenderer:
     """

diff --git a/setup.py b/setup.py
@@ -20,12 +20,12 @@
     url="https://github.com/Quansight/jupyterlab-omnisci",  # Optional
     packages=find_packages(),
     install_requires=[
+        "jupyterlab>=1.0.0rc0",
+        "ibis-framework>=1.0.0",
+        "altair>=3.0.1",
+        "ipywidgets",
         "vdom",
         "pyyaml",
-        "altair==3.0.1",
-        "ipywidgets",
-        "ibis-framework==1.0.0",
-        "vega_datasets",
-        "jupyterlab==1.0.0a8"
+        "vega_datasets"
     ]
 )