Merge pull request #88 from MetaCell/fix_netpyne23

point to right netpyne

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"

setup.py

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