Merge branch 'master' into mco-io

force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_data_source.py

@@ -15,10 +15,10 @@ class CSVExtractorDataSource(BaseDataSource):
                 if rowindex == self.model.row:
                     return DataSourceResult(
                         originator=self,
-                        value_types = [self.model.cuba_type],
+                        value_types=[self.model.cuba_type],
                         values=numpy.array(
                             parameters.values[0]+float(
-                                row[self.model.column])).reshape(1,1)
+                                row[self.model.column])).reshape(1, 1)
                     )
 
                 return None

force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_calculator.py

@@ -17,7 +17,6 @@ class KPIAdderCalculator(BaseKPICalculator):
 
         return KPICalculatorResult(
             originator=self,
-            value_types = [self.model.cuba_type_out],
+            value_types=[self.model.cuba_type_out],
             values=numpy.array([sum])
         )
-

force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_model.py

-from traits.api import HasStrictTraits, Int, String
+from traits.api import HasStrictTraits, String
 
 
 class KPIAdderModel(HasStrictTraits):

force_bdss/data_sources/data_source_result.py

@@ -7,9 +7,9 @@ class DataSourceResult(HasTraits):
     """Represents the result of a simulator.
     It contains the resulting cuba key, the associated uncertainty and the
     originating simulator.
-    Difference between uncertainty and quality: uncertainty is a numerical value
-    of the value, as in the case of an experimental simulation.
-    quality is the level of accuracy of the (e.g.c omputational) method, as
+    Difference between uncertainty and quality: uncertainty is a numerical
+    value of the value, as in the case of an experimental simulation.
+    quality is the level of accuracy of the (e.g. computational) method, as
     the importance and reliability of that value. It should be an enumeration
     value such as HIGH, MEDIUM, POOR"""
     originator = Instance(BaseDataSource)

requirements/requirements.txt

@@ -2,4 +2,4 @@ envisage==4.6.0
 click==6.7
 six==1.10.0
 stevedore==1.24.0
-numpy=1.12.0
+numpy==1.12.0