Release 0.7.0 version adaptations

Author: filippomc

.dockerignore

@@ -14,6 +14,7 @@ node_modules
 webapp/build
 webapp/geppetto-client
 workspace
+netpyne_workspace
 .idea
 k8s
 /src

.gitignore

@@ -14,6 +14,7 @@ webapp/node_modules
 webapp/geppetto-client
 webapp/build
 workspace
+netpyne_workspace
 tests/frontend/e2e/node_modules
 Dockerfile_mini
 npm*

requirements.txt

@@ -43,6 +43,7 @@ multimethod==1.3
 nbconvert==5.6.1
 nbformat==5.0.6
 neuromllite==0.1.9
+netpyne==1.0.0
 NEURON==7.8.1.1
 numpy==1.18.5
 oauthlib==3.0.1

setup.py

@@ -15,7 +15,7 @@
 
 setuptools.setup(
     name="netpyne_ui",
-    version="0.6.0",
+    version="0.7.0",
     url="https://github.com/MetaCell/NetPyNE-UI",
     author="MetaCell",
     author_email="info@metacell.us",
@@ -39,6 +39,6 @@
     install_requires=[
         'jupyter-geppetto>=1.0.0',
         'NEURON>=7.8.0'
-        'netpyne==0.9.6'
+        'netpyne>=1.0.0'
     ],
 )

utilities/install.py

@@ -79,11 +79,15 @@ def main(netpyne_branch, workspace_branch, pygeppetto_branch=None, jupyter_geppe
 
     if not os.path.exists(DEPS_DIR):
         os.mkdir(DEPS_DIR)
-    clone(repository=NETPYNE, branch_or_tag=netpyne_branch)
-    execute(cmd=['pip', 'install', '-e', '.'], cwd=os.path.join(DEPS_DIR, NETPYNE_DIR))
+
 
     if development:
         os.chdir(DEPS_DIR)
+
+        cprint("Installing netpyne")
+        clone(repository=NETPYNE, branch_or_tag=netpyne_branch)
+        execute(cmd=['pip', 'install', '-e', '.'], cwd=os.path.join(DEPS_DIR, NETPYNE_DIR))
+
         # install pygeppetto
         cprint("Installing pygeppetto")
         clone(repository=PYGEPPETTO,

webapp/components/general/Dialog.js

@@ -26,7 +26,7 @@ const AboutContent = withStyles(styles)(({ classes }) => (
     <img width="250" src={logo_netpyne} />
     <Box m={1}>
       <Typography variant="h5" style={{ color: secondaryColor }}>
-        NetPyNE-UI v0.6.0
+        NetPyNE-UI v0.7.0
       </Typography>
     </Box>
 

webapp/package-lock.json

@@ -74,4 +74,4 @@
       ]
     }
   }
-}
+}