Merge branch 'development' of github.com:MetaCell/NetPyNE-UI into fix/bug-fastdelete

Author: aranega

.github/workflows/tests.yml

@@ -102,6 +102,28 @@ jobs:
           npm run Save_Open_File_test
       env:
           CI: true
+  RxD-test:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-20.04
+    container: lironavon/docker-puppeteer-container:14.16.0
+    env:
+      CI: true
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+          node-version: ${{ matrix.node-version }}
+          cache-dependency-path: frontend/e2e/tests/package-lock.json
+    - name: Test for RxD plot
+      run: |
+          cd tests/frontend/e2e
+          #install dependencies
+          npm ci
+          # run RxD Plot test
+          npm run RxD_test
+      env:
+          CI: true
   Tutorial_1-SmokeTest:
     # The type of runner that the job will run on
     runs-on: ubuntu-20.04

.gitignore

@@ -30,4 +30,5 @@ venv
 webapp/build
 webapp/.yalc
 node_modules
-sa_nyhead.mat
+sa_nyhead.mat
+workspace

Dockerfile

@@ -36,8 +36,8 @@ WORKDIR $FOLDER
 COPY --chown=1000:1000 requirements.txt requirements.txt
 RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip && pip install -r requirements.txt --prefer-binary
 
-COPY --chown=$NB_UID:1000 . .
-COPY --from=jsbuild --chown=$NB_UID:1000 /app webapp
+COPY --chown=jovyan:1000 . .
+COPY --from=jsbuild --chown=jovyan:1000 /app webapp
 
 
 RUN jupyter nbextension install --py --symlink --sys-prefix jupyter_geppetto

README.md

@@ -7,7 +7,7 @@
 
 ![Screenshot](https://github.com/MetaCell/NetPyNE-UI/raw/documentation/docs/netpyneui.png)
 
-This repository hosts the User Interface for [NetPyNE](http://www.neurosimlab.org/netpyne/). NetPyNE is a python package
+This repository hosts the User Interface for [NetPyNE](https://netpyne.v2.opensourcebrain.org/). NetPyNE is a python package
 to facilitate the development, parallel simulation and analysis of biological neuronal networks using the NEURON
 simulator.
 
@@ -116,4 +116,4 @@ docker-compose up --abort-on-container-exit --exit-code-from netpyne-ui-e2e
 ## Additional Notes
 
 NetPyNE-UI is being developed in collaboration with the [Neurosim Lab](http://neurosimlab.org/). See
-the [Wiki](https://github.com/MetaCell/NetPyNE-UI/wiki) for more info!
+the [Wiki](https://github.com/MetaCell/NetPyNE-UI/wiki) for more info!

netpyne_ui/mod_utils.py

@@ -51,6 +51,9 @@ def loadModMechFiles(compileMod, modFolder, forceRecompile=False):
                 neuron.load_mechanisms(str(modFolder))
             except:
                 logging.exception("Error loading mechanisms")
+                if not forceRecompile:
+                    logging.info("Trying to recompile mod files")
+                    loadModMechFiles(True, modFolder, forceRecompile=True)
                 raise
         finally:
             os.chdir(owd)

tests/frontend/e2e/jest-puppeteer.config.js

@@ -1,11 +1,11 @@
 module.exports = {
   launch: {
     headless: true,
-    args: ['--no-sandbox', '--disable-setuid-sandbox'],
     defaultViewport: {
       width: 1300,
       height: 1024
     },
     timeout: 120000
   },
+  exitOnPageError: false,
 }

tests/frontend/e2e/package.json

@@ -15,6 +15,7 @@
     "Tutorial_4_test":"jest --verbose Tut#4_smoke ",
     "Control_Panel_test": "jest --verbose ControlPanel ",
     "Save_Open_File_test": "jest --verbose SaveOpenFile",
+    "RxD_test": "jest --verbose RxD",
     "lint": "eslint --fix --ext .js,.jsx ."
   },
   "dependencies": {

tests/frontend/e2e/tests/EEG_and_Dipole_Tut#1.test.js

@@ -60,7 +60,7 @@ beforeAll(async () => {
 
 describe('EEG and Dipole Plot Test using Tutorial#1', () => {
 
-    it.skip('Open new page', async () => {
+    it('Open new page', async () => {
 
         console.log('Opening a new NetPyNE page')