Merge pull request #588 from MetaCell/release/0.8.1

Releasing/0.8.1 to development

Author: ddelpiano

requirements.txt

@@ -23,7 +23,7 @@ jedi==0.17.0
 Jinja2==2.11.2
 jsonpickle==2.1.0
 jsonschema==3.2.0
-jupyter_geppetto==1.1.1
+jupyter_geppetto==1.1.4
 jupyter-client==7.0.6
 jupyter-core==4.9.1
 jupyter-server==1.11.2

setup.py

@@ -15,7 +15,7 @@
 
 setuptools.setup(
     name="netpyne_ui",
-    version="0.8.0",
+    version="0.8.1",
     url="https://github.com/MetaCell/NetPyNE-UI",
     author="MetaCell",
     author_email="info@metacell.us",

utilities/install.py

@@ -136,7 +136,8 @@ def main(netpyne_branch, workspace_branch, geppetto_branch=None, skipNpm=False,
         execute(cmd=['npm', 'ci'], cwd=os.path.join(DEPS_DIR, META_DIR, JUPYTER_DIR, 'js'))
         execute(cmd=['npm', 'run', 'build-dev' if development else 'build'],
                 cwd=os.path.join(DEPS_DIR, META_DIR, JUPYTER_DIR, 'js'))
-
+  
+    execute(cmd=['jupyter', 'nbextension', 'uninstall', 'jupyter_geppetto'])                                                                            
     execute(cmd=['jupyter', 'nbextension', 'install', '--py', '--symlink', '--sys-prefix', 'jupyter_geppetto'])
     execute(cmd=['jupyter', 'nbextension', 'enable', '--py', '--sys-prefix', 'jupyter_geppetto'])
     execute(cmd=['jupyter', 'nbextension', 'enable', '--py', '--sys-prefix', 'widgetsnbextension'])

webapp/components/general/Dialog.js

@@ -26,7 +26,7 @@ const AboutContent = withStyles(styles)(({ classes }) => (
     <img width="250" src={logoNetpyne} />
     <Box m={1}>
       <Link variant="h5" style={{ display: 'block' }} href="https://github.com/MetaCell/NetPyNE-UI" target="_blank">
-        NetPyNE-UI v0.8.0
+        NetPyNE-UI v0.8.1
       </Link>
       <Link variant="h5" style={{ display: 'block' }} href="https://github.com/Neurosim-lab/netpyne" target="_blank">
         NetPyNE v1.0.2.1

webapp/dev_package.json

@@ -1,6 +1,6 @@
 {
   "name": "geppetto-netpyne",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Geppetto NetPyNE-UI frontend.",
   "repository": "https://github.com/MetaCell/NetPyNE-UI",
   "license": "MIT",

webapp/package.bak

@@ -1,6 +1,6 @@
 {
   "name": "geppetto-netpyne",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Geppetto NetPyNE-UI frontend.",
   "repository": "https://github.com/MetaCell/NetPyNE-UI",
   "license": "MIT",

webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geppetto-netpyne",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Geppetto NetPyNE-UI frontend.",
   "repository": "https://github.com/MetaCell/NetPyNE-UI",
   "license": "MIT",

webapp/redux/middleware/middleware.js

@@ -35,7 +35,7 @@ import * as Constants from '../../constants';
 import { ADD_EXPERIMENT, REMOVE_EXPERIMENT } from '../actions/experiments';
 
 
-const TIMEOUT = 10000;
+const TIMEOUT = 30000;
 const EXPERIMENT_POLL_INTERVAL = 5000;
 
 const STABLE_EXPERIMENTS_STATES = new Set([