Merge branch 'master' into deliver-to-ui

doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst

@@ -11,18 +11,18 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_bundle module
------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source module
+----------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_bundle
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source module
-----------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_factory module
+------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.tests.rst

@@ -4,18 +4,18 @@ force_bdss.core_plugins.dummy.csv_extractor.tests package
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_bundle module
-----------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source module
+---------------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_bundle
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source module
----------------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_factory module
+-----------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst

@@ -11,18 +11,18 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.dummy_dakota.dakota_bundle module
----------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator module
+---------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator module
----------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_dakota.dakota_factory module
+----------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.tests.rst

@@ -4,18 +4,18 @@ force_bdss.core_plugins.dummy.dummy_dakota.tests package
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_bundle module
---------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator module
+--------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator module
---------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_factory module
+---------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst

@@ -19,10 +19,10 @@ force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_bundle module
--------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_factory module
+--------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.tests.rst

@@ -12,10 +12,10 @@ force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source mod
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_bundle module
-------------------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_factory module
+-------------------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst

@@ -19,10 +19,10 @@ force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_bundle module
--------------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_factory module
+--------------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.rst

@@ -12,10 +12,10 @@ force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculat
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_bundle module
-------------------------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_factory module
+-------------------------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_bundle
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst

@@ -11,18 +11,18 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_bundle module
----------------------------------------------------------------
+force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator module
+-------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_bundle
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator module
--------------------------------------------------------------------
+force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_factory module
+----------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.tests.rst

@@ -4,18 +4,18 @@ force_bdss.core_plugins.dummy.kpi_adder.tests package
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_bundle module
---------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_calculator module
+------------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_bundle
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_calculator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_calculator module
-------------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_factory module
+---------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_calculator
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.core_plugins.dummy.tests.rst

@@ -4,18 +4,18 @@ force_bdss.core_plugins.dummy.tests package
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.tests.data_source_bundle_test_mixin module
-------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.tests.data_source_factory_test_mixin module
+-------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.tests.data_source_bundle_test_mixin
+.. automodule:: force_bdss.core_plugins.dummy.tests.data_source_factory_test_mixin
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.tests.kpi_calculator_bundle_test_mixin module
----------------------------------------------------------------------------
+force_bdss.core_plugins.dummy.tests.kpi_calculator_factory_test_mixin module
+----------------------------------------------------------------------------
 
-.. automodule:: force_bdss.core_plugins.dummy.tests.kpi_calculator_bundle_test_mixin
+.. automodule:: force_bdss.core_plugins.dummy.tests.kpi_calculator_factory_test_mixin
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.data_sources.rst

@@ -19,10 +19,10 @@ force_bdss.data_sources.base_data_source module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.base_data_source_bundle module
-------------------------------------------------------
+force_bdss.data_sources.base_data_source_factory module
+-------------------------------------------------------
 
-.. automodule:: force_bdss.data_sources.base_data_source_bundle
+.. automodule:: force_bdss.data_sources.base_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:
@@ -35,10 +35,10 @@ force_bdss.data_sources.base_data_source_model module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.i_data_source_bundle module
----------------------------------------------------
+force_bdss.data_sources.i_data_source_factory module
+----------------------------------------------------
 
-.. automodule:: force_bdss.data_sources.i_data_source_bundle
+.. automodule:: force_bdss.data_sources.i_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.data_sources.tests.rst

@@ -12,10 +12,10 @@ force_bdss.data_sources.tests.test_base_data_source module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.tests.test_base_data_source_bundle module
------------------------------------------------------------------
+force_bdss.data_sources.tests.test_base_data_source_factory module
+------------------------------------------------------------------
 
-.. automodule:: force_bdss.data_sources.tests.test_base_data_source_bundle
+.. automodule:: force_bdss.data_sources.tests.test_base_data_source_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.kpi.rst

@@ -19,10 +19,10 @@ force_bdss.kpi.base_kpi_calculator module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.base_kpi_calculator_bundle module
-------------------------------------------------
+force_bdss.kpi.base_kpi_calculator_factory module
+-------------------------------------------------
 
-.. automodule:: force_bdss.kpi.base_kpi_calculator_bundle
+.. automodule:: force_bdss.kpi.base_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:
@@ -35,10 +35,10 @@ force_bdss.kpi.base_kpi_calculator_model module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.i_kpi_calculator_bundle module
----------------------------------------------
+force_bdss.kpi.i_kpi_calculator_factory module
+----------------------------------------------
 
-.. automodule:: force_bdss.kpi.i_kpi_calculator_bundle
+.. automodule:: force_bdss.kpi.i_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.kpi.tests.rst

@@ -12,10 +12,10 @@ force_bdss.kpi.tests.test_base_kpi_calculator module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.tests.test_base_kpi_calculator_bundle module
------------------------------------------------------------
+force_bdss.kpi.tests.test_base_kpi_calculator_factory module
+------------------------------------------------------------
 
-.. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator_bundle
+.. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.mco.rst

@@ -20,18 +20,18 @@ force_bdss.mco.base_mco module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.base_mco_bundle module
--------------------------------------
+force_bdss.mco.base_mco_communicator module
+-------------------------------------------
 
-.. automodule:: force_bdss.mco.base_mco_bundle
+.. automodule:: force_bdss.mco.base_mco_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.base_mco_communicator module
--------------------------------------------
+force_bdss.mco.base_mco_factory module
+--------------------------------------
 
-.. automodule:: force_bdss.mco.base_mco_communicator
+.. automodule:: force_bdss.mco.base_mco_factory
     :members:
     :undoc-members:
     :show-inheritance:
@@ -44,10 +44,10 @@ force_bdss.mco.base_mco_model module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.i_mco_bundle module
-----------------------------------
+force_bdss.mco.i_mco_factory module
+-----------------------------------
 
-.. automodule:: force_bdss.mco.i_mco_bundle
+.. automodule:: force_bdss.mco.i_mco_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.mco.tests.rst

@@ -12,18 +12,18 @@ force_bdss.mco.tests.test_base_mco module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.tests.test_base_mco_bundle module
-------------------------------------------------
+force_bdss.mco.tests.test_base_mco_communicator module
+------------------------------------------------------
 
-.. automodule:: force_bdss.mco.tests.test_base_mco_bundle
+.. automodule:: force_bdss.mco.tests.test_base_mco_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.tests.test_base_mco_communicator module
-------------------------------------------------------
+force_bdss.mco.tests.test_base_mco_factory module
+-------------------------------------------------
 
-.. automodule:: force_bdss.mco.tests.test_base_mco_communicator
+.. automodule:: force_bdss.mco.tests.test_base_mco_factory
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/api/force_bdss.rst

@@ -50,14 +50,6 @@ force_bdss.bdss_application module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.bundle_registry_plugin module
-----------------------------------------
-
-.. automodule:: force_bdss.bundle_registry_plugin
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 force_bdss.core_evaluation_driver module
 ----------------------------------------
 
@@ -74,6 +66,14 @@ force_bdss.core_mco_driver module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.factory_registry_plugin module
+-----------------------------------------
+
+.. automodule:: force_bdss.factory_registry_plugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.ids module
 ---------------------
 

doc/source/api/force_bdss.tests.rst

@@ -19,18 +19,18 @@ force_bdss.tests.test_bdss_application module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.tests.test_bundle_registry_plugin module
+force_bdss.tests.test_core_evaluation_driver module
 ---------------------------------------------------
 
-.. automodule:: force_bdss.tests.test_bundle_registry_plugin
+.. automodule:: force_bdss.tests.test_core_evaluation_driver
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.tests.test_core_evaluation_driver module
----------------------------------------------------
+force_bdss.tests.test_factory_registry_plugin module
+----------------------------------------------------
 
-.. automodule:: force_bdss.tests.test_core_evaluation_driver
+.. automodule:: force_bdss.tests.test_factory_registry_plugin
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/conf.py

@@ -25,11 +25,6 @@ def mock_modules():
 
     from mock import MagicMock
 
-    try:
-        import numpy
-    except ImportError:
-        MOCK_MODULES.append('numpy')
-
     class Mock(MagicMock):
         @classmethod
         def __getattr__(cls, name):