bump version and fix dependencies

twosigma · Sep 7, 2020 · a6af501 · a6af501
1 parent 976ac7a
commit a6af501
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/beakerx_tabledisplay/beakerx_tabledisplay/_version.py b/beakerx_tabledisplay/beakerx_tabledisplay/_version.py
@@ -1,2 +1,2 @@
-version_info = (2, 0, 0)
+version_info = (2, 0, 1)
 __version__ = '.'.join(map(str, version_info))
diff --git a/beakerx_tabledisplay/beakerx_tabledisplay/commands.py b/beakerx_tabledisplay/beakerx_tabledisplay/commands.py
@@ -27,6 +27,9 @@ def install_subparser(subparser):
     install_parser.add_argument("--prefix",
                                 help="location of the environment to install into",
                                 default=sys.prefix)
+    install_parser.add_argument("--lab",
+                                help="install lab extension",
+                                action='store_true')
     return subparser
 
 
@@ -36,6 +39,9 @@ def uninstall_subparser(subparser):
     uninstall_parser.add_argument("--prefix",
                                   help="location of the environment to uninstall from",
                                   default=sys.prefix)
+    uninstall_parser.add_argument("--lab",
+                                  help="install lab extension",
+                                  action='store_true')
     return subparser
 
 
@@ -62,6 +68,6 @@ def beakerx_parse():
     if args.func == run_jupyter:
         args.func(jupyter_commands)
     elif not jupyter_commands:
-        args.func()
+        args.func(args)
     else:
         parser.parse_args(jupyter_commands)
diff --git a/beakerx_tabledisplay/beakerx_tabledisplay/install.py b/beakerx_tabledisplay/beakerx_tabledisplay/install.py
@@ -17,17 +17,18 @@
 import subprocess
 
 
-def install():
+def install(args):
     subprocess.check_call(
         ["jupyter", "nbextension", "install", "beakerx_tabledisplay", "--py", "--symlink", "--sys-prefix"])
     subprocess.check_call(["jupyter", "nbextension", "enable", "beakerx_tabledisplay", "--py", "--sys-prefix"])
     subprocess.check_call(["jupyter", "serverextension", "enable", "beakerx_tabledisplay", "--py", "--sys-prefix"])
-    if subprocess.call(["jupyter", "labextension", "install", "@jupyter-widgets/jupyterlab-manager", "--no-build"],
-                       stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) == 0:
+    if args.lab:
+        subprocess.call(["jupyter", "labextension", "install", "@jupyter-widgets/jupyterlab-manager", "--no-build"],
+                       stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         subprocess.check_call(["jupyter", "labextension", "install", "@beakerx/beakerx-tabledisplay"])
 
 
-def uninstall():
+def uninstall(args):
     subprocess.check_call(["jupyter", "nbextension", "disable", "beakerx_tabledisplay", "--py", "--sys-prefix"])
     subprocess.check_call(["jupyter", "nbextension", "uninstall", "beakerx_tabledisplay", "--py", "--sys-prefix"])
     subprocess.check_call(["jupyter", "serverextension", "disable", "beakerx_tabledisplay", "--py", "--sys-prefix"])

diff --git a/beakerx_tabledisplay/conda_recipe/meta.yaml b/beakerx_tabledisplay/conda_recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "beakerx_tabledisplay" %}
-{% set version = "2.0.0" %}
+{% set version = "2.0.1" %}
 
 package:
   name: "{{ name|lower }}"

diff --git a/beakerx_tabledisplay/setup.py b/beakerx_tabledisplay/setup.py
@@ -67,7 +67,7 @@
         ]
     },
     install_requires=[
-        'beakerx_base',
+        'beakerx_base>=2.0.1',
         'numpy',
         'pandas'
     ],