Merge branch 'development' of github.com:MetaCell/NetPyNE-UI into feature/netpyne-44

Author: aranega

jupyter_hub/Dockerfile_spawner

@@ -16,15 +16,15 @@ RUN /bin/bash -c "INCUBATOR_VER=${INCUBATOR_VER} source activate snakes && pip i
 # Clone NetPyNE-UI and install the development version
 RUN wget https://github.com/MetaCell/NetPyNE-UI/archive/$netpyneuiBranch.zip -q
 RUN unzip $netpyneuiBranch.zip
-WORKDIR /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/utilities
+WORKDIR /opt/workspace-$netpyneuiBranch/utilities
 RUN /bin/bash -c "source activate snakes && python --version"
 RUN /bin/bash -c "source activate snakes && exec python install.py branch $netpyneuiBranch"
 WORKDIR /home/jovyan
 RUN git clone https://github.com/Neurosim-lab/netpyne_workspace
 WORKDIR /home/jovyan/workspace
-RUN ln -sfn /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/netpyne_ui/tests tests
+RUN ln -sfn /opt/workspace-$netpyneuiBranch/netpyne_ui/tests tests
 
 # Copy jupyterhub_config
-# RUN cp /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/jupyterhub_config.py .
+# RUN cp /opt/workspace-$netpyneuiBranch/jupyterhub_config.py .
 
 CMD /bin/bash -c "source activate snakes && exec jupyterhub-singleuser --debug --NotebookApp.default_url=/geppetto --NotebookApp.token='' --library=netpyne_ui"

k8s/cf_values.yaml

@@ -11,7 +11,7 @@ hub:
   shutdownOnLogout: true
   extraConfig:
     timing: |
-      c.Spawner.notebook_dir = '/home/jovyan/work/NetPyNE-UI'
+      c.Spawner.notebook_dir = '/opt/workspace'
       c.Spawner.default_url = '/geppetto'
     spawner: >-
       c.Spawner.args = ["--library=netpyne_ui"]

k8s/minikube_values.yaml

@@ -20,7 +20,7 @@ hub:
       c.Spawner.port = 8000
       c.Spawner.http_timeout = 300
       c.Spawner.start_timeout = 300
-      c.Spawner.notebook_dir = '/home/jovyan/work/NetPyNE-UI'
+      c.Spawner.notebook_dir = '/opt/workspace'
       c.Spawner.default_url = '/geppetto'
       c.Spawner.debug = True
       c.Spawner.disable_check_xsrf=True

tests/frontend/e2e/tests/SaveOpenFile.test.js

@@ -382,7 +382,7 @@ describe('Save / Open File testing', () => {
             return pwd_code_outputs.map(pwd_code_output => pwd_code_output.innerText)
         })
 
-        expect(first_code_output[0]).toBe("'/home/jovyan/work/NetPyNE-UI/workspace'")
+        expect(first_code_output[0]).toBe("'/opt/workspace/workspace'")
 
         const code_lines = await python_frame.$$(selectors.PYTHON_CELL_SELECTOR)
 
@@ -398,7 +398,7 @@ describe('Save / Open File testing', () => {
             return cd_code_outputs.map(cd_code_output => cd_code_output.innerText)
         })
 
-        expect(second_code_output[0]).toBe("/home/jovyan/work/NetPyNE-UI/workspace/saved_models/aut_test/src\n")
+        expect(second_code_output[0]).toBe("/opt/workspace/workspace/saved_models/aut_test/src\n")
 
         const ls_code_lines = await python_frame.$$(selectors.PYTHON_CELL_SELECTOR)