#277 Implement fix 1: force neuron.nrn_dll_loaded

With this fix workspace mod mechanisms won't be loaded twice. See issue #277 for more info

Author: filippomc

.dockerignore

@@ -13,7 +13,7 @@ Dockerfile_dev
 webapp/node_modules
 webapp/build
 webapp/geppetto-client
-netpyne_workspace
+workspace
 tests
 k8s
 src

.gitignore

@@ -13,7 +13,7 @@ init.py
 webapp/node_modules
 webapp/geppetto-client
 webapp/build
-netpyne_workspace
+workspace
 tests/frontend/e2e/node_modules
 Dockerfile_mini
 npm*

jupyter_hub/Dockerfile_spawner

@@ -21,7 +21,7 @@ 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/netpyne_workspace
+WORKDIR /home/jovyan/workspace
 RUN ln -sfn /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/netpyne_ui/tests tests
 
 # Copy jupyterhub_config

netpyne_ui/constants.py

@@ -1,7 +1,7 @@
 import os
 
 UPLOAD_FOLDER_NAME = 'uploads'
-NETPYNE_WORKDIR = 'netpyne_workspace'
+NETPYNE_WORKDIR = 'workspace'
 
 ALLOWED_EXTENSIONS = ["py", "zip", "gz", ".tar.gz", "pdf", "txt", "xls", "png", "jpeg", "hoc"]
 

netpyne_ui/netpyne_geppetto.py

@@ -28,6 +28,7 @@
 
 os.chdir(NETPYNE_WORKDIR_PATH)
 
+neuron.nrn_dll_loaded.append("/home/user/NetPyNE-UI/workspace/mod") # Avoids to load workspace modfiles twice
 
 class NetPyNEGeppetto:
 

utilities/install.py

@@ -21,7 +21,7 @@
 JUPYTER_DIR = 'jupyter-geppetto'
 NETPYNE_DIR = 'netpyne'
 
-WORKSPACE_DIR = 'netpyne_workspace'
+WORKSPACE_DIR = 'workspace'
 
 os.environ['JUPYTER_CONFIG_DIR'] = os.path.join(ROOT_DIR, '.jupyter-config')
 
@@ -109,7 +109,7 @@ def main(netpyne_branch, workspace_branch, pygeppetto_branch=None, jupyter_geppe
 
     os.chdir(ROOT_DIR)
     cprint("Cloning workspace")
-    clone(repository=WORKSPACE, branch_or_tag=workspace_branch, cwdp=ROOT_DIR)
+    clone(repository=WORKSPACE, branch_or_tag=workspace_branch, folder=WORKSPACE_DIR, cwdp=ROOT_DIR)
     cprint("Compiling workspace modules")
     compile_mod()