From 47a82a4e236fcd8be350cb05bfa5b99f0ad94786 Mon Sep 17 00:00:00 2001 From: enicolasgomez Date: Tue, 8 Nov 2022 10:13:59 -0500 Subject: [PATCH 1/6] Releasing 081 --- setup.py | 2 +- webapp/components/general/Dialog.js | 2 +- webapp/dev_package.json | 2 +- webapp/package.bak | 2 +- webapp/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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/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", From d15c637c3733d95255a7683ba66c87f718a01356 Mon Sep 17 00:00:00 2001 From: enicolasgomez Date: Tue, 8 Nov 2022 12:18:38 -0500 Subject: [PATCH 2/6] Bumped to jupyter-geppetto 1.1.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 9d78313173fe896dab09541664f495d7415acbd8 Mon Sep 17 00:00:00 2001 From: enicolasgomez Date: Fri, 11 Nov 2022 09:18:03 -0300 Subject: [PATCH 3/6] Incremented timeout time --- webapp/redux/middleware/middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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([ From db2d24ee867d9f6ec75fb7c826d6cf12437e60cf Mon Sep 17 00:00:00 2001 From: enicolasgomez Date: Fri, 11 Nov 2022 09:57:50 -0300 Subject: [PATCH 4/6] Added force flag to jupyer installation scripts --- utilities/install.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/install.py b/utilities/install.py index 8e6dea2e..ea16da14 100644 --- a/utilities/install.py +++ b/utilities/install.py @@ -137,10 +137,10 @@ def main(netpyne_branch, workspace_branch, geppetto_branch=None, skipNpm=False, 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', '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']) - execute(cmd=['jupyter', 'serverextension', 'enable', '--py', '--sys-prefix', 'jupyter_geppetto']) + execute(cmd=['jupyter', 'nbextension', 'install', '--py', '--symlink', '--force', '--sys-prefix', 'jupyter_geppetto']) + execute(cmd=['jupyter', 'nbextension', 'enable', '--py', '--sys-prefix', '--force', 'jupyter_geppetto']) + execute(cmd=['jupyter', 'nbextension', 'enable', '--py', '--sys-prefix', '--force', 'widgetsnbextension']) + execute(cmd=['jupyter', 'serverextension', 'enable', '--py', '--sys-prefix', '--force', 'jupyter_geppetto']) # Set python console theme print("Installing notebook theme") From 2fa671081dd5e9b15086f8a2365987bf80fd0dbe Mon Sep 17 00:00:00 2001 From: enicolasgomez Date: Fri, 11 Nov 2022 10:40:05 -0300 Subject: [PATCH 5/6] Added force remove command --- utilities/install.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/utilities/install.py b/utilities/install.py index ea16da14..88b62143 100644 --- a/utilities/install.py +++ b/utilities/install.py @@ -137,10 +137,11 @@ def main(netpyne_branch, workspace_branch, geppetto_branch=None, skipNpm=False, 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', 'install', '--py', '--symlink', '--force', '--sys-prefix', 'jupyter_geppetto']) - execute(cmd=['jupyter', 'nbextension', 'enable', '--py', '--sys-prefix', '--force', 'jupyter_geppetto']) - execute(cmd=['jupyter', 'nbextension', 'enable', '--py', '--sys-prefix', '--force', 'widgetsnbextension']) - execute(cmd=['jupyter', 'serverextension', 'enable', '--py', '--sys-prefix', '--force', 'jupyter_geppetto']) + execute(cmd=['rm', '-rf', '/opt/conda/share/jupyter/nbextensions/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']) + execute(cmd=['jupyter', 'serverextension', 'enable', '--py', '--sys-prefix', 'jupyter_geppetto']) # Set python console theme print("Installing notebook theme") From 4a148d079b7fc61ec65d2a177e857b88be675f7d Mon Sep 17 00:00:00 2001 From: enicolasgomez Date: Fri, 11 Nov 2022 11:03:26 -0300 Subject: [PATCH 6/6] added extension uninstall command --- utilities/install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/install.py b/utilities/install.py index 88b62143..339abde6 100644 --- a/utilities/install.py +++ b/utilities/install.py @@ -136,8 +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=['rm', '-rf', '/opt/conda/share/jupyter/nbextensions/jupyter_geppetto']) + + 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'])