make tests fixtures-based

Author: Terji Petersen

.pre-commit-config.yaml

@@ -59,11 +59,6 @@ repos:
         - flake8==5.0.4
         - flake8-bugbear==22.7.1
         - pandas-dev-flaker==0.5.0
--   repo: https://github.com/pycqa/pylint
-    rev: v2.15.5
-    hooks:
-    -   id: pylint
-        stages: [manual]
 -   repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:

pandas/tests/indexes/interval/test_constructors.py

@@ -40,43 +40,36 @@ class ConstructorTests:
     get_kwargs_from_breaks to the expected format.
     """
 
-    def _skip_test_constructor(self, dtype):
-        # get_kwargs_from_breaks in TestFromTuples and TestClassconstructors just return
-        # tuples of ints, so IntervalIndex can't know the original dtype
-        return False, ""
-
-    @pytest.mark.parametrize(
-        "breaks",
-        [
-            [3, 14, 15, 92, 653],
-            np.arange(10, dtype="int64"),
-            Int64Index(range(-10, 11)),
-            UInt64Index(range(10, 31)),
-            Float64Index(np.arange(20, 30, 0.5)),
-            date_range("20180101", periods=10),
-            date_range("20180101", periods=10, tz="US/Eastern"),
-            timedelta_range("1 day", periods=10),
-        ],
+    @pytest.fixture(
+        params=[
+            ([3, 14, 15, 92, 653], np.int64),
+            (np.arange(10, dtype="int64"), np.int64),
+            (Int64Index(range(-10, 11)), np.int64),
+            (UInt64Index(range(10, 31)), np.uint64),
+            (Float64Index(np.arange(20, 30, 0.5)), np.float64),
+            (date_range("20180101", periods=10), "<M8[ns]"),
+            (
+                date_range("20180101", periods=10, tz="US/Eastern"),
+                "datetime64[ns, US/Eastern]",
+            ),
+            (timedelta_range("1 day", periods=10), "<m8[ns]"),
+        ]
     )
-    @pytest.mark.parametrize("use_dtype", [True, False])
-    def test_constructor(self, constructor, breaks, closed, name, use_dtype):
-        breaks_dtype = getattr(breaks, "dtype", "int64")
+    def breaks_and_expected_subtype(self, request):
+        return request.param
 
-        skip, skip_msg = self._skip_test_constructor(breaks_dtype)
-        if skip:
-            pytest.skip(skip_msg)
+    def test_constructor(self, constructor, breaks_and_expected_subtype, closed, name):
+        breaks, expected_subtype = breaks_and_expected_subtype
 
         result_kwargs = self.get_kwargs_from_breaks(breaks, closed)
-        if use_dtype:
-            result_kwargs["dtype"] = IntervalDtype(breaks_dtype, closed=closed)
 
         result = constructor(closed=closed, name=name, **result_kwargs)
 
         assert result.closed == closed
         assert result.name == name
-        assert result.dtype.subtype == breaks_dtype
-        tm.assert_index_equal(result.left, Index(breaks[:-1]))
-        tm.assert_index_equal(result.right, Index(breaks[1:]))
+        assert result.dtype.subtype == expected_subtype
+        tm.assert_index_equal(result.left, Index(breaks[:-1], dtype=expected_subtype))
+        tm.assert_index_equal(result.right, Index(breaks[1:], dtype=expected_subtype))
 
     @pytest.mark.parametrize(
         "breaks, subtype",
@@ -309,7 +302,27 @@ def test_left_right_dont_share_data(self):
         assert result._left.base is None or result._left.base is not result._right.base
 
 
-class TestFromTuples(ConstructorTests):
+class TuplesClassConstructorTests(ConstructorTests):
+    @pytest.fixture(
+        params=[
+            ([3, 14, 15, 92, 653], np.int64),
+            (np.arange(10, dtype="int64"), np.int64),
+            (Int64Index(range(-10, 11)), np.int64),
+            (UInt64Index(range(10, 31)), np.int64),
+            (Float64Index(np.arange(20, 30, 0.5)), np.float64),
+            (date_range("20180101", periods=10), "<M8[ns]"),
+            (
+                date_range("20180101", periods=10, tz="US/Eastern"),
+                "datetime64[ns, US/Eastern]",
+            ),
+            (timedelta_range("1 day", periods=10), "<m8[ns]"),
+        ]
+    )
+    def breaks_and_expected_subtype(self, request):
+        return request.param
+
+
+class TestFromTuples(TuplesClassConstructorTests):
     """Tests specific to IntervalIndex.from_tuples"""
 
     def _skip_test_constructor(self, dtype):
@@ -362,7 +375,7 @@ def test_na_tuples(self):
         tm.assert_index_equal(idx_na_tuple, idx_na_element)
 
 
-class TestClassConstructors(ConstructorTests):
+class TestClassConstructors(TuplesClassConstructorTests):
     """Tests specific to the IntervalIndex/Index constructors"""
 
     def _skip_test_constructor(self, dtype):