updates to code and test cases and fix some deprecation

Author: jtsodapop

labelbox/data/annotation_types/geometry/mask.py

@@ -93,7 +93,7 @@ def draw(self,
 
         canvas = canvas if canvas is not None else np.zeros(tuple(dims),
                                                             dtype=np.uint8)
-        canvas[mask.astype(np.bool)] = color
+        canvas[mask.astype(bool)] = color
         return canvas
 
     def _extract_polygons_from_contours(self, contours: List) -> MultiPolygon:

tests/data/metrics/confusion_matrix/test_confusion_matrix_data_row.py

@@ -1,10 +1,10 @@
 from pytest_cases import fixture_ref
-from pytest_cases import pytest_parametrize_plus, fixture_ref
+from pytest_cases import parametrize, fixture_ref
 
 from labelbox.data.metrics.confusion_matrix.confusion_matrix import confusion_matrix_metric
 
 
-@pytest_parametrize_plus("tool_examples", [
+@parametrize("tool_examples", [
     fixture_ref('polygon_pairs'),
     fixture_ref('rectangle_pairs'),
     fixture_ref('mask_pairs'),
@@ -27,10 +27,9 @@ def test_overlapping_objects(tool_examples):
                 expected), f"{example.predictions},{example.ground_truths}"
 
 
-@pytest_parametrize_plus(
-    "tool_examples",
-    [fixture_ref('checklist_pairs'),
-     fixture_ref('radio_pairs')])
+@parametrize("tool_examples",
+             [fixture_ref('checklist_pairs'),
+              fixture_ref('radio_pairs')])
 def test_overlapping_classifications(tool_examples):
     for example in tool_examples:
         score = confusion_matrix_metric(example.ground_truths,

tests/data/metrics/confusion_matrix/test_confusion_matrix_feature.py

@@ -1,10 +1,10 @@
 from pytest_cases import fixture_ref
-from pytest_cases import pytest_parametrize_plus, fixture_ref
+from pytest_cases import parametrize, fixture_ref
 
 from labelbox.data.metrics.confusion_matrix.confusion_matrix import feature_confusion_matrix_metric
 
 
-@pytest_parametrize_plus("tool_examples", [
+@parametrize("tool_examples", [
     fixture_ref('polygon_pairs'),
     fixture_ref('rectangle_pairs'),
     fixture_ref('mask_pairs'),
@@ -23,10 +23,9 @@ def test_overlapping_objects(tool_examples):
             assert metrics == example.expected, f"{example.predictions},{example.ground_truths}"
 
 
-@pytest_parametrize_plus(
-    "tool_examples",
-    [fixture_ref('checklist_pairs'),
-     fixture_ref('radio_pairs')])
+@parametrize("tool_examples",
+             [fixture_ref('checklist_pairs'),
+              fixture_ref('radio_pairs')])
 def test_overlapping_classifications(tool_examples):
     for example in tool_examples:
 

tests/data/metrics/iou/data_row/test_data_row_iou.py

@@ -42,20 +42,15 @@ def check_iou_checklist(pair, mask=None):
                 annotation.value.mask.arr = np.frombuffer(
                     base64.b64decode(annotation.value.mask.url.encode('utf-8')),
                     dtype=np.uint8).reshape((32, 32, 3))
-    # print("drowmiou\n\n", data_row_miou(label, prediction),
-    #   pair.data_row_expected, "\n")
     assert math.isclose(data_row_miou(label, prediction),
                         pair.data_row_expected)
     assert math.isclose(
         miou_metric(label.annotations, prediction.annotations)[0].value,
         pair.data_row_expected)
     feature_ious = feature_miou_metric(label.annotations,
                                        prediction.annotations)
-    b = [feature.value for feature in feature_ious]
-    # print("fiou\n\n", b, pair.expected, "\n")
     mapping = {}
     for iou in feature_ious:
-        print(iou)
         if not mapping.get(iou.value, None):
             mapping[iou.value] = 0
         mapping[iou.value] += 1