Merge branch 'test-casper-appbar' of github.com:MetaCell/NetPyNE-UI into test-casper-appbar

Author: adrianq

.travis.yml

@@ -15,8 +15,8 @@ install:
 - cd geppetto-netpyne
 - if [ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out development ..." && git checkout development; fi
 - cd ..
-- npm install --silent -g phantomjs 
-- npm install --silent -g casperjs 
+- npm install --silent -g phantomjs
+- npm install --silent -g casperjs
 - npm install --silent -g slimerjs
 - npm install --silent -g gl
 python:
@@ -36,6 +36,7 @@ addons:
     - libgl1-mesa-dri
     - libglapi-mesa
     - libosmesa6
+
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"

Dockerfile

@@ -54,4 +54,4 @@ RUN /bin/bash -c "source activate snakes && jupyter nbextension enable --py widg
 WORKDIR /home/jovyan
 RUN git clone --branch CNS18 https://github.com/Neurosim-lab/netpyne_workspace
 WORKDIR /home/jovyan/netpyne_workspace
-CMD /bin/bash -c "source activate snakes && exec jupyter notebook --debug --NotebookApp.default_url=/geppetto --NotebookApp.token=''"
+CMD /bin/bash -c "source activate snakes && exec jupyter notebook --debug --NotebookApp.default_url=/geppetto --NotebookApp.token=''"

Dockerfile_dev

@@ -59,5 +59,5 @@ RUN /bin/bash -c "source activate snakes && python --version"
 RUN /bin/bash -c "source activate snakes && exec python install.py branch $netpyneuiBranch"
 WORKDIR /home/jovyan
 RUN git clone https://github.com/Neurosim-lab/netpyne_workspace
-WORKDIR /home/jovyan/netpyne_workspace
+WORKDIR /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch
 CMD /bin/bash -c "source activate snakes && exec jupyter notebook --debug --NotebookApp.default_url=/geppetto --NotebookApp.token='' --library=netpyne_ui"

setup.py

@@ -40,6 +40,6 @@
     ],
     install_requires=[
         'jupyter_geppetto==0.4.1.2',
-        'netpyne-py3==0.7.9'
+        'netpyne==0.9.0'
     ],
 )