Merge pull request #230 from NeuroML/experimental

To v1.0.6 & remove inspyred req

Author: pgleeson

.github/workflows/ci.yml

@@ -51,6 +51,10 @@ jobs:
     - name: Install package
       run: |
         python -m pip install --upgrade pip
+
+        # Ensure very latest inspyred (not on pypi) is installed
+        pip install git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
+
         pip install -r requirements.txt
         pip install .
 

docs/requirements.txt

@@ -12,8 +12,7 @@ pylems
 graphviz
 argparse
 neuromllite
-neurotune
-git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
+neurotune>=0.2.6 # now manages the version of inspyred
 neuron
 pydata-sphinx-theme
 vispy

pyneuroml/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__version__ = "1.0.5"
+__version__ = "1.0.6"
 
 JNEUROML_VERSION = "0.12.2"
 

pyneuroml/tune/NeuroMLTuner.py

@@ -4,7 +4,7 @@
 This module provides the `run_optimisation` function that pyNeuroML users can
 use to optimise their NeuroML models. It uses the evolutionary computation
 framework provided by Neurotune, which is based on the Inspyred optimisation
-library's Evolutionary Computation class `inpsyred.ec.EvolutionaryComputation`:
+library's Evolutionary Computation class `inspyred.ec.EvolutionaryComputation`:
 
 - https://neurotune.readthedocs.io/en/latest/index.html
 - https://github.com/aarongarrett/inspyred/

pyneuroml/tune/__init__.py

@@ -1,8 +1,8 @@
 """
-Package for tuning NeuroML based nodels.
+Package for tuning NeuroML based models.
 
 This uses the neurotune package (https://neurotune.readthedocs.io/en/latest/)
-to provide a framework for tuning NeuroML models using the evolutionaly
+to provide a framework for tuning NeuroML models using the evolutional
 computation algorithms from the inspyred
 (https://github.com/aarongarrett/inspyred/) package.
 

requirements-development.txt

@@ -12,9 +12,7 @@ git+https://github.com/NeuralEnsemble/libNeuroML.git@development#egg=libNeuroML
 git+https://github.com/LEMS/pylems.git@development#egg=pylems
 
 pyelectro
-neurotune
-
-git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
+neurotune>=0.2.6 # now manages the version of inspyred
 
 pytest
 pytest-cov

requirements-experimental.txt

@@ -12,9 +12,8 @@ git+https://github.com/NeuralEnsemble/libNeuroML.git@development#egg=libNeuroML
 git+https://github.com/LEMS/pylems.git@development#egg=pylems
 
 pyelectro
-neurotune
+neurotune>=0.2.6 # now manages the version of inspyred
 
-git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
 
 pytest
 pytest-cov

requirements.txt

@@ -11,9 +11,8 @@ git+https://github.com/NeuralEnsemble/libNeuroML.git@master#egg=libNeuroML
 git+https://github.com/LEMS/pylems.git@master#egg=pylems
 
 pyelectro
-neurotune
+neurotune>=0.2.6 # now manages the version of inspyred
 
-git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
 
 pytest
 pytest-cov