update to tox requirements so that it uses non-latest pytest to work with pytest-cases

Author: jtsodapop

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/integration/annotation_import/test_ndjson_validation.py

@@ -1,6 +1,6 @@
 import pytest
 import ndjson
-from pytest_cases import pytest_parametrize_plus, fixture_ref
+from pytest_cases import parametrize, fixture_ref
 
 from labelbox.exceptions import MALValidationError
 from labelbox.schema.bulk_import_request import (NDChecklist, NDClassification,
@@ -23,14 +23,14 @@ def test_subclassification_construction(rectangle_inference):
     assert isinstance(tool.classifications[0], NDRadio)
 
 
-@pytest_parametrize_plus("inference, expected_type",
-                         [(fixture_ref('polygon_inference'), NDPolygon),
-                          (fixture_ref('rectangle_inference'), NDRectangle),
-                          (fixture_ref('line_inference'), NDPolyline),
-                          (fixture_ref('entity_inference'), NDTextEntity),
-                          (fixture_ref('segmentation_inference'), NDMask),
-                          (fixture_ref('segmentation_inference_rle'), NDMask),
-                          (fixture_ref('segmentation_inference_png'), NDMask)])
+@parametrize("inference, expected_type",
+             [(fixture_ref('polygon_inference'), NDPolygon),
+              (fixture_ref('rectangle_inference'), NDRectangle),
+              (fixture_ref('line_inference'), NDPolyline),
+              (fixture_ref('entity_inference'), NDTextEntity),
+              (fixture_ref('segmentation_inference'), NDMask),
+              (fixture_ref('segmentation_inference_rle'), NDMask),
+              (fixture_ref('segmentation_inference_png'), NDMask)])
 def test_tool_construction(inference, expected_type):
     assert isinstance(NDTool.build(inference), expected_type)
 

tox.ini

@@ -6,7 +6,7 @@ envlist = py36, py37, py38
 # install pytest in the virtualenv where commands will be executed
 deps =
     -rrequirements.txt
-    pytest
+    pytest < 7.0.0
     pytest-cases
 passenv = LABELBOX_TEST_API_KEY_PROD LABELBOX_TEST_API_KEY_STAGING LABELBOX_TEST_ENVIRON
 commands = pytest {posargs}