Merge pull request #229 from NeuroML/experimental

Install pyelectro & neurotune from pypi

Author: pgleeson

.travis.yml

@@ -12,8 +12,7 @@ pylems
 graphviz
 argparse
 neuromllite
-git+https://github.com/NeuralEnsemble/neurotune.git#egg=neurotune
-git+https://github.com/NeuralEnsemble/pyelectro.git@master#egg=pyelectro
+neurotune
 git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
 neuron
 pydata-sphinx-theme

docs/requirements.txt

@@ -1,6 +1,6 @@
 import logging
 
-__version__ = "1.0.3"
+__version__ = "1.0.4"
 
 JNEUROML_VERSION = "0.12.2"
 

pyneuroml/__init__.py

@@ -11,8 +11,8 @@ git+https://github.com/ModECI/modelspec.git@development#egg=modelspec
 git+https://github.com/NeuralEnsemble/libNeuroML.git@development#egg=libNeuroML
 git+https://github.com/LEMS/pylems.git@development#egg=pylems
 
-git+https://github.com/NeuralEnsemble/pyelectro.git@development#egg=pyelectro
-git+https://github.com/NeuralEnsemble/neurotune.git@development#egg=neurotune
+pyelectro
+neurotune
 
 git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
 

requirements-development.txt

@@ -11,8 +11,8 @@ git+https://github.com/ModECI/modelspec.git@development#egg=modelspec
 git+https://github.com/NeuralEnsemble/libNeuroML.git@development#egg=libNeuroML
 git+https://github.com/LEMS/pylems.git@development#egg=pylems
 
-git+https://github.com/NeuralEnsemble/pyelectro.git@development#egg=pyelectro
-git+https://github.com/NeuralEnsemble/neurotune.git@development#egg=neurotune
+pyelectro
+neurotune
 
 git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
 

requirements-experimental.txt

@@ -11,8 +11,8 @@ ppft
 git+https://github.com/NeuralEnsemble/libNeuroML.git@master#egg=libNeuroML
 git+https://github.com/LEMS/pylems.git@master#egg=pylems
 
-git+https://github.com/NeuralEnsemble/pyelectro.git@master#egg=pyelectro
-git+https://github.com/NeuralEnsemble/neurotune.git@master#egg=neurotune
+pyelectro
+neurotune
 
 git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
 

requirements.txt

@@ -13,7 +13,7 @@
     "povray": ["opencv-python"],
     "hdf5": ["tables"],
     "analysis": ["pyelectro"],
-    "tune": ["neurotune @ git+ssh://[email protected]/NeuralEnsemble/neurotune.git",
+    "tune": ["neurotune",
              "inspyred @ git+ssh://[email protected]/aarongarrett/inspyred.git",
              "ppft"],
     "vispy": ["vispy", "pyqt5"],