Merge pull request #31 from jcoady/master

VPython support on JupyterHub and Binder

Author: jcoady

requirements.txt

@@ -1,3 +1,2 @@
 Cython
 vpython
-jupyter-server-proxy

setup.py

@@ -18,7 +18,7 @@
 
 import versioneer
 
-install_requires = ['jupyter', 'numpy', 'ipykernel',
+install_requires = ['jupyter', 'jupyter-server-proxy', 'numpy', 'ipykernel',
                     'autobahn>=18.8.2']
 
 if sys.version_info.major == 3 and sys.version_info.minor >= 5:

vpython/with_notebook.py

@@ -58,10 +58,15 @@ def find_free_port():
     if jupyterlab.__version__ >= '0.35.0':
         from os.path import join
         labextensions_dir = join(jupyterlab.commands.get_app_dir(), u'static')
-        notebook.nbextensions.install_nbextension(path=package_dir + "/vpython_data",
-                                                  nbextensions_dir=labextensions_dir,
-                                                  overwrite=False,
-                                                  verbose=0)
+        try:
+            notebook.nbextensions.install_nbextension(path=package_dir + "/vpython_data",
+                	                              nbextensions_dir=labextensions_dir,
+                        	                      overwrite=False,
+                                                      verbose=0)
+        except PermissionError:
+            #logging.info("PermissionError: Unable to install /vpython_data directory and files for VPython on JupyterLab")
+            pass
+
 
 if 'nbextensions' in os.listdir(jd):
     ldir = os.listdir(nbdir)
@@ -101,7 +106,10 @@ def find_free_port():
 display(Javascript("""if (typeof Jupyter !== "undefined") {require(["nbextensions/vpython_libraries/glowcomm"], function(){console.log("GLOWCOMM LOADED");});}else{element.textContent = ' ';}"""))
 display(Javascript("""if (typeof Jupyter !== "undefined") {require(["nbextensions/vpython_libraries/jquery-ui.custom.min"], function(){console.log("JQUERY LOADED");});}else{element.textContent = ' ';}"""))
 
-time.sleep(1)      # allow some time for javascript code above to run before attempting to setup Comm Channel
+if transfer:
+    time.sleep(4)      # allow some time for javascript code above to run after nbextensions update before attempting to setup Comm Channel
+else:
+    time.sleep(2)      # allow some time for javascript code above to run before attempting to setup Comm Channel
 
 wsConnected = False