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

Author: alejoe91

bluepyopt/deapext/optimisationsCMA.py

@@ -250,7 +250,6 @@ def run(
             terminator (multiprocessing.Event): exit loop when is set.
                 Not taken into account if None.
         """
-
         if cp_filename:
             cp_filename_tmp = cp_filename + '.tmp'
 

tox.ini

@@ -39,7 +39,7 @@ commands =
     syntax: flake8 . --count --select=E9,F63,F72,F82 --show-source --statistics
 
     unit: pytest --cov=bluepyopt {[testenv]coverage_options} bluepyopt/tests -k unit
-    functional: pytest --cov=bluepyopt {[testenv]coverage_options} bluepyopt/tests -k-unit
+    functional: pytest --cov=bluepyopt {[testenv]coverage_options} bluepyopt/tests -k 'not unit'
 
 [testenv:docs]
 basepython = python3.6