pre commit

Author: chean.wei.khor

pandas/tests/indexes/interval/test_astype.py

@@ -133,7 +133,7 @@ class TestFloatSubtype(AstypeTests):
     """Tests specific to IntervalIndex with float subtype"""
 
     indexes = [
-        interval_range(-10.0, 10.0, closed="neither"),
+        interval_range(-10.0, 10.0, inclusive="neither"),
         IntervalIndex.from_arrays(
             [-1.5, np.nan, 0.0, 0.0, 1.5], [-0.5, np.nan, 1.0, 1.0, 3.0], closed="both"
         ),
@@ -161,6 +161,7 @@ def test_subtype_integer(self, subtype):
     @pytest.mark.parametrize("subtype", ["int64", "uint64"])
     def test_subtype_integer_with_non_integer_borders(self, subtype):
         index = interval_range(0.0, 3.0, freq=0.25)
+
         dtype = IntervalDtype(subtype, "right")
         result = index.astype(dtype)
         expected = IntervalIndex.from_arrays(
@@ -191,10 +192,10 @@ class TestDatetimelikeSubtype(AstypeTests):
     """Tests specific to IntervalIndex with datetime-like subtype"""
 
     indexes = [
-        interval_range(Timestamp("2018-01-01"), periods=10, closed="neither"),
+        interval_range(Timestamp("2018-01-01"), periods=10, inclusive="neither"),
         interval_range(Timestamp("2018-01-01"), periods=10).insert(2, NaT),
         interval_range(Timestamp("2018-01-01", tz="US/Eastern"), periods=10),
-        interval_range(Timedelta("0 days"), periods=10, closed="both"),
+        interval_range(Timedelta("0 days"), periods=10, inclusive="both"),
         interval_range(Timedelta("0 days"), periods=10).insert(2, NaT),
     ]
 

pandas/tests/indexes/interval/test_interval.py

@@ -167,10 +167,10 @@ def test_delete(self, closed):
     @pytest.mark.parametrize(
         "data",
         [
-            interval_range(0, periods=10, closed="neither"),
-            interval_range(1.7, periods=8, freq=2.5, closed="both"),
-            interval_range(Timestamp("20170101"), periods=12, closed="left"),
-            interval_range(Timedelta("1 day"), periods=6, closed="right"),
+            interval_range(0, periods=10, inclusive="neither"),
+            interval_range(1.7, periods=8, freq=2.5, inclusive="both"),
+            interval_range(Timestamp("20170101"), periods=12, inclusive="left"),
+            interval_range(Timedelta("1 day"), periods=6, inclusive="right"),
         ],
     )
     def test_insert(self, data):
@@ -868,9 +868,9 @@ def test_nbytes(self):
     @pytest.mark.parametrize("new_closed", ["left", "right", "both", "neither"])
     def test_set_closed(self, name, closed, new_closed):
         # GH 21670
-        index = interval_range(0, 5, closed=closed, name=name)
+        index = interval_range(0, 5, inclusive=closed, name=name)
         result = index.set_closed(new_closed)
-        expected = interval_range(0, 5, closed=new_closed, name=name)
+        expected = interval_range(0, 5, inclusive=new_closed, name=name)
         tm.assert_index_equal(result, expected)
 
     @pytest.mark.parametrize("bad_closed", ["foo", 10, "LEFT", True, False])

pandas/tests/indexes/interval/test_interval_range.py

@@ -34,25 +34,25 @@ def test_constructor_numeric(self, closed, name, freq, periods):
 
         # defined from start/end/freq
         result = interval_range(
-            start=start, end=end, freq=freq, name=name, closed=closed
+            start=start, end=end, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from start/periods/freq
         result = interval_range(
-            start=start, periods=periods, freq=freq, name=name, closed=closed
+            start=start, periods=periods, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from end/periods/freq
         result = interval_range(
-            end=end, periods=periods, freq=freq, name=name, closed=closed
+            end=end, periods=periods, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
         # GH 20976: linspace behavior defined from start/end/periods
         result = interval_range(
-            start=start, end=end, periods=periods, name=name, closed=closed
+            start=start, end=end, periods=periods, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
@@ -67,19 +67,19 @@ def test_constructor_timestamp(self, closed, name, freq, periods, tz):
 
         # defined from start/end/freq
         result = interval_range(
-            start=start, end=end, freq=freq, name=name, closed=closed
+            start=start, end=end, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from start/periods/freq
         result = interval_range(
-            start=start, periods=periods, freq=freq, name=name, closed=closed
+            start=start, periods=periods, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from end/periods/freq
         result = interval_range(
-            end=end, periods=periods, freq=freq, name=name, closed=closed
+            end=end, periods=periods, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
@@ -88,7 +88,7 @@ def test_constructor_timestamp(self, closed, name, freq, periods, tz):
             # matches expected only for non-anchored offsets and tz naive
             # (anchored/DST transitions cause unequal spacing in expected)
             result = interval_range(
-                start=start, end=end, periods=periods, name=name, closed=closed
+                start=start, end=end, periods=periods, name=name, inclusive=closed
             )
             tm.assert_index_equal(result, expected)
 
@@ -102,25 +102,25 @@ def test_constructor_timedelta(self, closed, name, freq, periods):
 
         # defined from start/end/freq
         result = interval_range(
-            start=start, end=end, freq=freq, name=name, closed=closed
+            start=start, end=end, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from start/periods/freq
         result = interval_range(
-            start=start, periods=periods, freq=freq, name=name, closed=closed
+            start=start, periods=periods, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from end/periods/freq
         result = interval_range(
-            end=end, periods=periods, freq=freq, name=name, closed=closed
+            end=end, periods=periods, freq=freq, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 
         # GH 20976: linspace behavior defined from start/end/periods
         result = interval_range(
-            start=start, end=end, periods=periods, name=name, closed=closed
+            start=start, end=end, periods=periods, name=name, inclusive=closed
         )
         tm.assert_index_equal(result, expected)
 

pandas/tests/indexes/interval/test_setops.py

@@ -194,7 +194,7 @@ def test_set_incompatible_types(self, closed, op_name, sort):
             tm.assert_index_equal(result, expected)
 
         # GH 19016: incompatible dtypes -> cast to object
-        other = interval_range(Timestamp("20180101"), periods=9, closed=closed)
+        other = interval_range(Timestamp("20180101"), periods=9, inclusive=closed)
         expected = getattr(index.astype(object), op_name)(other, sort=sort)
         if op_name == "difference":
             expected = index

pandas/tests/indexing/test_coercion.py

@@ -709,7 +709,7 @@ def test_fillna_datetime64tz(self, index_or_series, fill_val, fill_dtype):
         ],
     )
     def test_fillna_interval(self, index_or_series, fill_val):
-        ii = pd.interval_range(1.0, 5.0, closed="right").insert(1, np.nan)
+        ii = pd.interval_range(1.0, 5.0, inclusive="right").insert(1, np.nan)
         assert isinstance(ii.dtype, pd.IntervalDtype)
         obj = index_or_series(ii)
 

pandas/tests/indexing/test_loc.py

@@ -1508,12 +1508,12 @@ def test_loc_getitem_interval_index(self):
 
     def test_loc_getitem_interval_index2(self):
         # GH#19977
-        index = pd.interval_range(start=0, periods=3, closed="both")
+        index = pd.interval_range(start=0, periods=3, inclusive="both")
         df = DataFrame(
             [[1, 2, 3], [4, 5, 6], [7, 8, 9]], index=index, columns=["A", "B", "C"]
         )
 
-        index_exp = pd.interval_range(start=0, periods=2, freq=1, closed="both")
+        index_exp = pd.interval_range(start=0, periods=2, freq=1, inclusive="both")
         expected = Series([1, 4], index=index_exp, name="A")
         result = df.loc[1, "A"]
         tm.assert_series_equal(result, expected)

pandas/tests/util/test_assert_interval_array_equal.py

@@ -9,7 +9,7 @@
     [
         {"start": 0, "periods": 4},
         {"start": 1, "periods": 5},
-        {"start": 5, "end": 10, "closed": "left"},
+        {"start": 5, "end": 10, "inclusive": "left"},
     ],
 )
 def test_interval_array_equal(kwargs):
@@ -19,8 +19,9 @@ def test_interval_array_equal(kwargs):
 
 def test_interval_array_equal_closed_mismatch():
     kwargs = {"start": 0, "periods": 5}
-    arr1 = interval_range(closed="left", **kwargs).values
-    arr2 = interval_range(closed="right", **kwargs).values
+    arr1 = interval_range(inclusive="left", **kwargs).values
+    arr1 = interval_range(inclusive="left", **kwargs).values
+    arr2 = interval_range(inclusive="right", **kwargs).values
 
     msg = """\
 IntervalArray are different