Moved also MCO to separate plugin

force_bdss/mco/basic_bundle.py → force_bdss/core_plugins/test_mco/basic/basic_bundle.py

 from traits.has_traits import HasStrictTraits, provides
 from traits.trait_types import String
 
-from .i_multi_criteria_optimizer_bundle import IMultiCriteriaOptimizerBundle
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
+    IMultiCriteriaOptimizerBundle)
 from .basic_model import BasicModel
 from .basic_optimizer import BasicOptimizer
 

force_bdss/mco/basic_optimizer.py → force_bdss/core_plugins/test_mco/basic/basic_optimizer.py

 import subprocess
 import sys
 
-from force_bdss.mco.base_multi_criteria_optimizer import \
+from force_bdss.mco.base_multi_criteria_optimizer import (
     BaseMultiCriteriaOptimizer
+)
 
 
 class BasicOptimizer(BaseMultiCriteriaOptimizer):

force_bdss/mco/dakota_bundle.py → force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py

 from traits.has_traits import HasStrictTraits, provides
 from traits.trait_types import String
 
-from force_bdss.mco.dakota_optimizer import DakotaOptimizer
-from force_bdss.mco.dakota_model import DakotaModel
-from .i_multi_criteria_optimizer_bundle import IMultiCriteriaOptimizerBundle
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
+    IMultiCriteriaOptimizerBundle)
+
+from .dakota_model import DakotaModel
+from .dakota_optimizer import DakotaOptimizer
 
 
 @provides(IMultiCriteriaOptimizerBundle)

force_bdss/mco/dakota_model.py → force_bdss/core_plugins/test_mco/dakota/dakota_model.py

-from traits.has_traits import HasStrictTraits
+from traits.api import HasStrictTraits
 
 
 class DakotaModel(HasStrictTraits):

force_bdss/mco/dakota_optimizer.py → force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py

@@ -2,8 +2,9 @@ import subprocess
 
 import sys
 
-from force_bdss.mco.base_multi_criteria_optimizer import \
+from force_bdss.mco.base_multi_criteria_optimizer import (
     BaseMultiCriteriaOptimizer
+)
 
 
 class DakotaOptimizer(BaseMultiCriteriaOptimizer):

force_bdss/mco/multi_criteria_optimizers_plugin.py → force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py

 from envisage.plugin import Plugin
 from traits.api import List
 
-from .i_multi_criteria_optimizer_bundle import (
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
     IMultiCriteriaOptimizerBundle)
-from .dakota_bundle import DakotaBundle
-from .basic_bundle import BasicBundle
+
+from .basic.basic_bundle import BasicBundle
+from .dakota.dakota_bundle import DakotaBundle
 
 
 class MultiCriteriaOptimizersPlugin(Plugin):

setup.py

@@ -10,11 +10,8 @@ setup(
             'force_bdss = force_bdss.cli.force_bdss:run',
         ],
         "force.bdss.extensions": [
-            "mco = force_bdss.mco.multi_criteria_optimizers_plugin:"
-            "MultiCriteriaOptimizersPlugin",
-            "data_source = force_bdss.core_plugins."
-            "test_data_sources.data_sources_plugin:"
-            "DataSourcesPlugin",
+            "mco = force_bdss.core_plugins.test_mco.multi_criteria_optimizers_plugin:MultiCriteriaOptimizersPlugin",
+            "data_source = force_bdss.core_plugins.test_data_sources.data_sources_plugin:DataSourcesPlugin",
         ]
     },
     packages=find_packages(),