From e93f61b16aa5a47d05a1d418b5fcf5598d7bda88 Mon Sep 17 00:00:00 2001 From: Stefano Borini <sborini@enthought.com> Date: Thu, 27 Jul 2017 16:09:10 +0100 Subject: [PATCH] Silenced warnings for IDs not specified by specifying them --- force_bdss/api.py | 2 +- force_bdss/core_evaluation_driver.py | 4 ++++ force_bdss/core_mco_driver.py | 4 ++++ force_bdss/core_plugins/dummy/dummy_plugin.py | 4 +++- force_bdss/ids.py | 4 ++++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/force_bdss/api.py b/force_bdss/api.py index 68364b6..9f2e4ba 100644 --- a/force_bdss/api.py +++ b/force_bdss/api.py @@ -1,5 +1,5 @@ from .base_extension_plugin import BaseExtensionPlugin # noqa -from .ids import bundle_id # noqa +from .ids import bundle_id, plugin_id # noqa from .data_sources.base_data_source_model import BaseDataSourceModel # noqa from .data_sources.data_source_result import DataSourceResult # noqa diff --git a/force_bdss/core_evaluation_driver.py b/force_bdss/core_evaluation_driver.py index 61dac3e..d8a4fbb 100644 --- a/force_bdss/core_evaluation_driver.py +++ b/force_bdss/core_evaluation_driver.py @@ -3,17 +3,21 @@ from __future__ import print_function import sys from traits.api import on_trait_change +from .ids import plugin_id from .base_core_driver import BaseCoreDriver from .io.workflow_reader import ( InvalidVersionException, InvalidFileException ) +CORE_EVALUATION_DRIVER_ID = plugin_id("core", "CoreEvaluationDriver") + class CoreEvaluationDriver(BaseCoreDriver): """Main plugin that handles the execution of the MCO or the evaluation. """ + id = CORE_EVALUATION_DRIVER_ID @on_trait_change("application:started") def application_started(self): diff --git a/force_bdss/core_mco_driver.py b/force_bdss/core_mco_driver.py index 07973cc..bf22630 100644 --- a/force_bdss/core_mco_driver.py +++ b/force_bdss/core_mco_driver.py @@ -4,17 +4,21 @@ import sys from traits.api import on_trait_change +from .ids import plugin_id from .base_core_driver import BaseCoreDriver from .io.workflow_reader import ( InvalidVersionException, InvalidFileException ) +CORE_MCO_DRIVER_ID = plugin_id("core", "CoreMCODriver") + class CoreMCODriver(BaseCoreDriver): """Main plugin that handles the execution of the MCO or the evaluation. """ + id = CORE_MCO_DRIVER_ID @on_trait_change("application:started") def application_started(self): diff --git a/force_bdss/core_plugins/dummy/dummy_plugin.py b/force_bdss/core_plugins/dummy/dummy_plugin.py index 3eca5b3..f77b4dc 100644 --- a/force_bdss/core_plugins/dummy/dummy_plugin.py +++ b/force_bdss/core_plugins/dummy/dummy_plugin.py @@ -1,4 +1,4 @@ -from force_bdss.api import BaseExtensionPlugin +from force_bdss.api import BaseExtensionPlugin, plugin_id from .csv_extractor.csv_extractor_bundle import CSVExtractorBundle from .kpi_adder.kpi_adder_bundle import KPIAdderBundle from .dummy_dakota.dakota_bundle import DummyDakotaBundle @@ -9,6 +9,8 @@ from .dummy_kpi_calculator.dummy_kpi_calculator_bundle import ( class DummyPlugin(BaseExtensionPlugin): + id = plugin_id("enthought", "DummyPlugin") + def _data_source_bundles_default(self): return [DummyDataSourceBundle(), CSVExtractorBundle()] diff --git a/force_bdss/ids.py b/force_bdss/ids.py index 81ff106..b51a796 100644 --- a/force_bdss/ids.py +++ b/force_bdss/ids.py @@ -36,6 +36,10 @@ def mco_parameter_id(producer, identifier): return _string_id("mco_parameter", producer, identifier) +def plugin_id(producer, identifier): + return _string_id("plugin", producer, identifier) + + def _string_id(entity_namespace, producer, identifier): """Creates an id for a generic entity. -- GitLab