Merge branch 'master' into extract-and-normalize-ids

.travis.yml

@@ -22,7 +22,9 @@ script:
     - flake8 .
     - python -m unittest discover
     - pip install -r requirements/doc_requirements.txt
-    - sphinx-build -W doc/source doc/build/sphinx
+    - pushd doc
+    - make html
+    - popd
 after_success:
     - coverage run -m unittest discover
     - pip install codecov

force_bdss/data_sources/base_data_source.py

@@ -25,12 +25,6 @@ class BaseDataSource(ABCHasStrictTraits):
         self.model = model
         super(BaseDataSource, self).__init__(*args, **kwargs)
 
-    @property
-    def name(self):
-        """Utility property to retrieve the bundle name from the data source
-        object."""
-        return self.bundle.name
-
     @abc.abstractmethod
     def run(self, parameters):
         """Executes the data source evaluation/fetching and returns

force_bdss/kpi/base_kpi_calculator.py

@@ -25,11 +25,6 @@ class BaseKPICalculator(ABCHasStrictTraits):
         self.model = model
         super(BaseKPICalculator, self).__init__(*args, **kwargs)
 
-    @property
-    def name(self):
-        """Convenience property. Returns the name of the originating bundle."""
-        return self.bundle.name
-
     @abc.abstractmethod
     def run(self, data_source_results):
         """

force_bdss/mco/base_multi_criteria_optimizer.py

@@ -25,12 +25,6 @@ class BaseMultiCriteriaOptimizer(ABCHasStrictTraits):
         self.model = model
         super(BaseMultiCriteriaOptimizer, self).__init__(*args, **kwargs)
 
-    @property
-    def name(self):
-        """Convenience property to return the name of the bundle from the
-        MCO itself"""
-        return self.bundle.name
-
     @abc.abstractmethod
     def run(self):
         """Reimplement this method to perform the MCO operations."""