Merge pull request #70 from force-h2020/move-workflow-to-core

Moved workflow to core. Removed workspecs.

doc/source/api/force_bdss.core.rst

@@ -19,6 +19,14 @@ force_bdss.core.data_value module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.core.workflow module
+-------------------------------
+
+.. automodule:: force_bdss.core.workflow
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------

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

@@ -4,6 +4,14 @@ force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests package
 Submodules
 ----------
 
+force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator module
+-----------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_bundle module
 ------------------------------------------------------------------------------------------------
 

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

@@ -12,6 +12,14 @@ force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_bundle module
     :undoc-members:
     :show-inheritance:
 
+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_calculator
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------

doc/source/api/force_bdss.rst

@@ -14,7 +14,6 @@ Subpackages
     force_bdss.kpi
     force_bdss.mco
     force_bdss.tests
-    force_bdss.workspecs
 
 Submodules
 ----------

doc/source/api/force_bdss.workspecs.rst

-force_bdss.workspecs package
-============================
-
-Submodules
-----------
-
-force_bdss.workspecs.workflow module
-------------------------------------
-
-.. automodule:: force_bdss.workspecs.workflow
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.workspecs
-    :members:
-    :undoc-members:
-    :show-inheritance:

force_bdss/base_core_driver.py

 from envisage.plugin import Plugin
 from traits.trait_types import Instance
 
+from .core.workflow import Workflow
 from .bundle_registry_plugin import (
     BundleRegistryPlugin,
     BUNDLE_REGISTRY_PLUGIN_ID
 )
 from .io.workflow_reader import WorkflowReader
-from .workspecs.workflow import Workflow
 
 
 class BaseCoreDriver(Plugin):

force_bdss/workspecs/workflow.py → force_bdss/core/workflow.py

 from traits.api import HasStrictTraits, Instance, List
 
-from ..data_sources.base_data_source_model import BaseDataSourceModel
-from ..kpi.base_kpi_calculator_model import BaseKPICalculatorModel
-from ..mco.base_mco_model import BaseMCOModel
+from force_bdss.data_sources.base_data_source_model import BaseDataSourceModel
+from force_bdss.kpi.base_kpi_calculator_model import BaseKPICalculatorModel
+from force_bdss.mco.base_mco_model import BaseMCOModel
 
 
 class Workflow(HasStrictTraits):

force_bdss/io/tests/test_workflow_writer.py

-import unittest
 import json
+import unittest
+
 from six import StringIO
 
 from force_bdss.bundle_registry_plugin import BundleRegistryPlugin
@@ -17,7 +18,7 @@ from force_bdss.ids import bundle_id, mco_parameter_id
 from force_bdss.io.workflow_writer import WorkflowWriter
 from force_bdss.mco.base_mco_model import BaseMCOModel
 from force_bdss.mco.i_mco_bundle import IMCOBundle
-from force_bdss.workspecs.workflow import Workflow
+from force_bdss.core.workflow import Workflow
 
 
 class TestWorkflowWriter(unittest.TestCase):

force_bdss/io/workflow_reader.py

@@ -3,8 +3,8 @@ import logging
 
 from traits.api import HasStrictTraits, Instance
 
+from force_bdss.core.workflow import Workflow
 from ..bundle_registry_plugin import BundleRegistryPlugin
-from ..workspecs.workflow import Workflow
 
 SUPPORTED_FILE_VERSIONS = ["1"]