Merge branch 'master' into gaugup/AddScheduledBuilds

Author: gaugup

dice_ml/counterfactual_explanations.py

@@ -166,7 +166,7 @@ def to_json(self):
                 combined_test_instance_list.append(serialized_cf_examples[
                     _DiverseCFV2SchemaConstants.TEST_INSTANCE_LIST])
                 combined_final_cfs_list.append(serialized_cf_examples[
-                    _DiverseCFV2SchemaConstants.FIANL_CFS_LIST])
+                    _DiverseCFV2SchemaConstants.FINAL_CFS_LIST])
                 data_interface = serialized_cf_examples[
                     _DiverseCFV2SchemaConstants.DATA_INTERFACE]
                 feature_names = serialized_cf_examples[
@@ -252,7 +252,7 @@ def from_json(json_str):
                     # counterfactual example.
                     cf_examples_str = json.dumps(
                         {
-                            _DiverseCFV2SchemaConstants.FIANL_CFS_LIST: json_dict[
+                            _DiverseCFV2SchemaConstants.FINAL_CFS_LIST: json_dict[
                                 _CounterfactualExpV2SchemaConstants.CFS_LIST][index],
                             _DiverseCFV2SchemaConstants.TEST_INSTANCE_LIST: json_dict[
                                 _CounterfactualExpV2SchemaConstants.TEST_DATA][index],

dice_ml/diverse_counterfactuals.py

@@ -24,7 +24,7 @@ class _DiverseCFV2SchemaConstants:
     FEATURE_NAMES_INCLUDING_TARGET = 'feature_names_including_target'
     FEATURE_NAMES = 'feature_names'
     TEST_INSTANCE_LIST = 'test_instance_list'
-    FIANL_CFS_LIST = 'final_cfs_list'
+    FINAL_CFS_LIST = 'final_cfs_list'
 
 
 def json_converter(obj):
@@ -199,7 +199,7 @@ def to_json(self, serialization_version):
 
             alternate_obj = {
                 _DiverseCFV2SchemaConstants.TEST_INSTANCE_LIST: test_instance_df_as_list,
-                _DiverseCFV2SchemaConstants.FIANL_CFS_LIST: final_cfs_df_as_as_list,
+                _DiverseCFV2SchemaConstants.FINAL_CFS_LIST: final_cfs_df_as_as_list,
                 _DiverseCFV2SchemaConstants.DATA_INTERFACE: dummy_data_interface_dict,
                 _DiverseCFV2SchemaConstants.FEATURE_NAMES: feature_names,
                 _DiverseCFV2SchemaConstants.FEATURE_NAMES_INCLUDING_TARGET: feature_names_including_target,
@@ -231,7 +231,7 @@ def from_json(cf_example_json_str):
                                           desired_range=cf_example_dict[_DiverseCFV1SchemaConstants.DESIRED_RANGE],
                                           model_type=cf_example_dict[_DiverseCFV1SchemaConstants.MODEL_TYPE])
         else:
-            final_cfs_list = cf_example_dict[_DiverseCFV2SchemaConstants.FIANL_CFS_LIST]
+            final_cfs_list = cf_example_dict[_DiverseCFV2SchemaConstants.FINAL_CFS_LIST]
             test_instance_list = cf_example_dict[_DiverseCFV2SchemaConstants.TEST_INSTANCE_LIST]
             feature_names_including_target = cf_example_dict[_DiverseCFV2SchemaConstants.FEATURE_NAMES_INCLUDING_TARGET]
 

requirements-test.txt

@@ -5,3 +5,6 @@ pytest
 pytest-cov
 twine
 pytest-mock
+
+# Pin scikit-learn
+scikit-learn<1.1.2