diff --git a/requirements.txt b/requirements.txt index 82f95f7d..f0493074 100644 --- a/requirements.txt +++ b/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 diff --git a/setup.py b/setup.py index 10bafe56..c5a99b0c 100644 --- a/setup.py +++ b/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", diff --git a/utilities/install.py b/utilities/install.py index 8e6dea2e..339abde6 100644 --- a/utilities/install.py +++ b/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']) diff --git a/webapp/components/general/Dialog.js b/webapp/components/general/Dialog.js index c45fb129..b1000c96 100644 --- a/webapp/components/general/Dialog.js +++ b/webapp/components/general/Dialog.js @@ -26,7 +26,7 @@ const AboutContent = withStyles(styles)(({ classes }) => ( - NetPyNE-UI v0.8.0 + NetPyNE-UI v0.8.1 NetPyNE v1.0.2.1 diff --git a/webapp/dev_package.json b/webapp/dev_package.json index d5c1cc7d..925a50ca 100644 --- a/webapp/dev_package.json +++ b/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", diff --git a/webapp/package.bak b/webapp/package.bak index 2f42bc1b..5ec9ba14 100644 --- a/webapp/package.bak +++ b/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", diff --git a/webapp/package.json b/webapp/package.json index d5c1cc7d..925a50ca 100644 --- a/webapp/package.json +++ b/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", diff --git a/webapp/redux/middleware/middleware.js b/webapp/redux/middleware/middleware.js index 1ef171d7..b151127c 100644 --- a/webapp/redux/middleware/middleware.js +++ b/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([