Merge branch 'master' of https://github.com/BlueBrain/BluePyOpt into lfpy

Conflicts:
	bluepyopt/ephys/parameterscalers.py

Author: Jaquier Aurélien Tristan

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
             python setup.py sdist bdist_wheel
 
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_PASSWORD }}

bluepyopt/deapext/algorithms.py

@@ -160,7 +160,7 @@ def eaAlphaMuPlusLambdaCheckpoint(
     gen = start_gen + 1
     stopping_params = {"gen": gen}
     while utils.run_next_gen(
-            not(_check_stopping_criteria(stopping_criteria, stopping_params)),
+            not (_check_stopping_criteria(stopping_criteria, stopping_params)),
             terminator):
         offspring = _get_offspring(parents, toolbox, cxpb, mutpb)
 
@@ -175,7 +175,7 @@ def eaAlphaMuPlusLambdaCheckpoint(
 
         logger.info(logbook.stream)
 
-        if(cp_filename and cp_frequency and
+        if (cp_filename and cp_frequency and
            gen % cp_frequency == 0):
             cp = dict(population=population,
                       generation=gen,

bluepyopt/ephys/serializer.py

@@ -25,15 +25,16 @@ def _serializer(value):
         elif isinstance(value, (list, tuple)) and \
                 value and hasattr(value[0], 'to_dict'):
             return [v.to_dict() for v in value]
-        elif(isinstance(value, dict) and value and
-             hasattr(next(iter(list(value.values()))), 'to_dict')):
+        elif (isinstance(value, dict) and value and
+                hasattr(
+                    next(iter(list(value.values()))), 'to_dict')):
             return {k: v.to_dict() for k, v in list(value.items())}
         return value
 
     @staticmethod
     def _deserializer(value):
         """_deserializer"""
-        if(isinstance(value, list) and value and
+        if (isinstance(value, list) and value and
            isinstance(value[0], dict) and SENTINAL in value[0]):
             return [instantiator(v) for v in value]
         elif isinstance(value, dict) and value:

bluepyopt/tests/test_deapext/test_utils.py

@@ -23,7 +23,7 @@ def catch_event(event):
 
     # event is set by another process case
     time.sleep(2)
-    assert not(utils.run_next_gen(True, event))
+    assert not (utils.run_next_gen(True, event))
 
 
 @pytest.mark.unit

setup.py

@@ -39,7 +39,7 @@
     install_requires=[
         'numpy>=1.6',
         'pandas>=0.18',
-        'deap',
+        'deap>=1.3.3',
         'efel>=2.13',
         'ipyparallel',
         'pickleshare>=0.7.3',