#292 #277 small cleaning

Author: filippomc

Dockerfile

@@ -29,6 +29,5 @@ RUN python install.py ${BUILD_ARGS}
 WORKDIR ${INSTALLATION_FOLDER}
 
 RUN pip install -r requirements-test.txt
-RUN pip install -e .
 RUN pytest tests/backend
 CMD /bin/bash -c "jupyter notebook --NotebookApp.default_url=/geppetto --NotebookApp.token='' --library=netpyne_ui --NotebookApp.disable_check_xsrf=True"

netpyne_ui/mod_utils.py

@@ -1,3 +1,4 @@
+import shutil
 import subprocess
 import os
 
@@ -30,7 +31,8 @@ def compileModMechFiles(compileMod, modFolder):
     if compileMod:
         modPath = os.path.join(str(modFolder), "x86_64")
 
-        subprocess.call(["rm", "-r", modPath])
+        if os.path.exists(modPath):
+            shutil.rmtree(modPath)
 
         os.chdir(modFolder)
         subprocess.call(["nrnivmodl"])

netpyne_ui/netpyne_geppetto.py

@@ -26,10 +26,10 @@
 from netpyne_ui.constants import NETPYNE_WORKDIR_PATH, NUM_CONN_LIMIT
 from netpyne_ui.mod_utils import compileModMechFiles
 
-
 os.chdir(NETPYNE_WORKDIR_PATH)
 
-neuron.nrn_dll_loaded.append(os.path.join(NETPYNE_WORKDIR_PATH, 'mod')) # Avoids to load workspace modfiles twice
+neuron.nrn_dll_loaded.append(os.path.join(NETPYNE_WORKDIR_PATH, 'mod'))  # Avoids to load workspace modfiles twice
+
 
 class NetPyNEGeppetto:
 
@@ -117,8 +117,6 @@ def simulateNetPyNEModelInGeppetto(self, args):
         except:
             return utils.getJSONError("Error while simulating the NetPyNE model", sys.exc_info())
 
-
-
     def loadModel(self, args):
         """ Imports a model stored as file in json format.
 

utilities/install.py

@@ -105,7 +105,7 @@ def main(netpyne_branch, workspace_branch, pygeppetto_branch=None, jupyter_geppe
     else:
         # install requirements
         cprint("Installing UI python package...")
-        execute(cmd=['pip', 'install', '.', '--no-deps'], cwd=ROOT_DIR)
+        execute(cmd=['pip', 'install', '-e', '.', '--no-deps'], cwd=ROOT_DIR)
 
     os.chdir(ROOT_DIR)
     cprint("Cloning workspace")