Revert "ENH: consistency of input args for boundaries - pd.interval_range (pandas-dev#46355)"

This reverts commit 073b353.

Author: mroeschke

doc/source/user_guide/advanced.rst

@@ -1082,14 +1082,14 @@ of :ref:`frequency aliases <timeseries.offset_aliases>` with datetime-like inter
 
    pd.interval_range(start=pd.Timedelta("0 days"), periods=3, freq="9H")
 
-Additionally, the ``inclusive`` parameter can be used to specify which side(s) the intervals
-are closed on.  Intervals are closed on the both side by default.
+Additionally, the ``closed`` parameter can be used to specify which side(s) the intervals
+are closed on.  Intervals are closed on the right side by default.
 
 .. ipython:: python
 
-   pd.interval_range(start=0, end=4, inclusive="both")
+   pd.interval_range(start=0, end=4, closed="both")
 
-   pd.interval_range(start=0, end=4, inclusive="neither")
+   pd.interval_range(start=0, end=4, closed="neither")
 
 Specifying ``start``, ``end``, and ``periods`` will generate a range of evenly spaced
 intervals from ``start`` to ``end`` inclusively, with ``periods`` number of elements

doc/source/whatsnew/v1.5.0.rst

@@ -821,7 +821,6 @@ Other Deprecations
 - Deprecated :attr:`Timedelta.freq` and :attr:`Timedelta.is_populated` (:issue:`46430`)
 - Deprecated :attr:`Timedelta.delta` (:issue:`46476`)
 - Deprecated passing arguments as positional in :meth:`DataFrame.any` and :meth:`Series.any` (:issue:`44802`)
-- Deprecated the ``closed`` argument in :meth:`interval_range` in favor of ``inclusive`` argument; In a future version passing ``closed`` will raise (:issue:`40245`)
 - Deprecated the methods :meth:`DataFrame.mad`, :meth:`Series.mad`, and the corresponding groupby methods (:issue:`11787`)
 - Deprecated positional arguments to :meth:`Index.join` except for ``other``, use keyword-only arguments instead of positional arguments (:issue:`46518`)
 - Deprecated positional arguments to :meth:`StringMethods.rsplit` and :meth:`StringMethods.split` except for ``pat``, use keyword-only arguments instead of positional arguments (:issue:`47423`)

pandas/core/indexes/interval.py

@@ -12,7 +12,6 @@
     Hashable,
     Literal,
 )
-import warnings
 
 import numpy as np
 
@@ -162,7 +161,7 @@ def _new_IntervalIndex(cls, d):
     A new ``IntervalIndex`` is typically constructed using
     :func:`interval_range`:
 
-    >>> pd.interval_range(start=0, end=5, inclusive="right")
+    >>> pd.interval_range(start=0, end=5)
     IntervalIndex([(0, 1], (1, 2], (2, 3], (3, 4], (4, 5]],
                   dtype='interval[int64, right]')
 
@@ -445,7 +444,7 @@ def is_overlapping(self) -> bool:
 
         Intervals that share closed endpoints overlap:
 
-        >>> index = pd.interval_range(0, 3, inclusive='both')
+        >>> index = pd.interval_range(0, 3, closed='both')
         >>> index
         IntervalIndex([[0, 1], [1, 2], [2, 3]],
               dtype='interval[int64, both]')
@@ -454,7 +453,7 @@ def is_overlapping(self) -> bool:
 
         Intervals that only have an open endpoint in common do not overlap:
 
-        >>> index = pd.interval_range(0, 3, inclusive='left')
+        >>> index = pd.interval_range(0, 3, closed='left')
         >>> index
         IntervalIndex([[0, 1), [1, 2), [2, 3)],
               dtype='interval[int64, left]')
@@ -958,8 +957,7 @@ def interval_range(
     periods=None,
     freq=None,
     name: Hashable = None,
-    closed: IntervalClosedType | lib.NoDefault = lib.no_default,
-    inclusive: IntervalClosedType | None = None,
+    closed: IntervalClosedType = "right",
 ) -> IntervalIndex:
     """
     Return a fixed frequency IntervalIndex.
@@ -982,14 +980,6 @@ def interval_range(
         Whether the intervals are closed on the left-side, right-side, both
         or neither.
 
-        .. deprecated:: 1.5.0
-           Argument `closed` has been deprecated to standardize boundary inputs.
-           Use `inclusive` instead, to set each bound as closed or open.
-    inclusive : {"both", "neither", "left", "right"}, default "both"
-        Include boundaries; Whether to set each bound as closed or open.
-
-        .. versionadded:: 1.5.0
-
     Returns
     -------
     IntervalIndex
@@ -1012,14 +1002,14 @@ def interval_range(
     --------
     Numeric ``start`` and  ``end`` is supported.
 
-    >>> pd.interval_range(start=0, end=5, inclusive="right")
+    >>> pd.interval_range(start=0, end=5)
     IntervalIndex([(0, 1], (1, 2], (2, 3], (3, 4], (4, 5]],
                   dtype='interval[int64, right]')
 
     Additionally, datetime-like input is also supported.
 
     >>> pd.interval_range(start=pd.Timestamp('2017-01-01'),
-    ...                   end=pd.Timestamp('2017-01-04'), inclusive="right")
+    ...                   end=pd.Timestamp('2017-01-04'))
     IntervalIndex([(2017-01-01, 2017-01-02], (2017-01-02, 2017-01-03],
                    (2017-01-03, 2017-01-04]],
                   dtype='interval[datetime64[ns], right]')
@@ -1028,56 +1018,33 @@ def interval_range(
     endpoints of the individual intervals within the ``IntervalIndex``.  For
     numeric ``start`` and ``end``, the frequency must also be numeric.
 
-    >>> pd.interval_range(start=0, periods=4, freq=1.5, inclusive="right")
+    >>> pd.interval_range(start=0, periods=4, freq=1.5)
     IntervalIndex([(0.0, 1.5], (1.5, 3.0], (3.0, 4.5], (4.5, 6.0]],
                   dtype='interval[float64, right]')
 
     Similarly, for datetime-like ``start`` and ``end``, the frequency must be
     convertible to a DateOffset.
 
     >>> pd.interval_range(start=pd.Timestamp('2017-01-01'),
-    ...                   periods=3, freq='MS', inclusive="right")
+    ...                   periods=3, freq='MS')
     IntervalIndex([(2017-01-01, 2017-02-01], (2017-02-01, 2017-03-01],
                    (2017-03-01, 2017-04-01]],
                   dtype='interval[datetime64[ns], right]')
 
     Specify ``start``, ``end``, and ``periods``; the frequency is generated
     automatically (linearly spaced).
 
-    >>> pd.interval_range(start=0, end=6, periods=4, inclusive="right")
+    >>> pd.interval_range(start=0, end=6, periods=4)
     IntervalIndex([(0.0, 1.5], (1.5, 3.0], (3.0, 4.5], (4.5, 6.0]],
               dtype='interval[float64, right]')
 
-    The ``inclusive`` parameter specifies which endpoints of the individual
+    The ``closed`` parameter specifies which endpoints of the individual
     intervals within the ``IntervalIndex`` are closed.
 
-    >>> pd.interval_range(end=5, periods=4, inclusive='both')
+    >>> pd.interval_range(end=5, periods=4, closed='both')
     IntervalIndex([[1, 2], [2, 3], [3, 4], [4, 5]],
                   dtype='interval[int64, both]')
     """
-    if inclusive is not None and closed is not lib.no_default:
-        raise ValueError(
-            "Deprecated argument `closed` cannot be passed "
-            "if argument `inclusive` is not None"
-        )
-    elif closed is not lib.no_default:
-        warnings.warn(
-            "Argument `closed` is deprecated in favor of `inclusive`.",
-            FutureWarning,
-            stacklevel=2,
-        )
-        if closed is None:
-            inclusive = "both"
-        elif closed in ("both", "neither", "left", "right"):
-            inclusive = closed
-        else:
-            raise ValueError(
-                "Argument `closed` has to be either"
-                "'both', 'neither', 'left' or 'right'"
-            )
-    elif inclusive is None:
-        inclusive = "both"
-
     start = maybe_box_datetimelike(start)
     end = maybe_box_datetimelike(end)
     endpoint = start if start is not None else end
@@ -1150,4 +1117,4 @@ def interval_range(
         else:
             breaks = timedelta_range(start=start, end=end, periods=periods, freq=freq)
 
-    return IntervalIndex.from_breaks(breaks, name=name, closed=inclusive)
+    return IntervalIndex.from_breaks(breaks, name=name, closed=closed)

pandas/tests/frame/methods/test_round.py

@@ -210,7 +210,7 @@ def test_round_nonunique_categorical(self):
 
     def test_round_interval_category_columns(self):
         # GH#30063
-        columns = pd.CategoricalIndex(pd.interval_range(0, 2, inclusive="right"))
+        columns = pd.CategoricalIndex(pd.interval_range(0, 2))
         df = DataFrame([[0.66, 1.1], [0.3, 0.25]], columns=columns)
 
         result = df.round()

pandas/tests/groupby/aggregate/test_cython.py

@@ -216,7 +216,7 @@ def test_cython_agg_empty_buckets_nanops(observed):
     result = df.groupby(pd.cut(df["a"], grps), observed=observed)._cython_agg_general(
         "sum", alt=None, numeric_only=True
     )
-    intervals = pd.interval_range(0, 20, freq=5, inclusive="right")
+    intervals = pd.interval_range(0, 20, freq=5)
     expected = DataFrame(
         {"a": [0, 0, 36, 0]},
         index=pd.CategoricalIndex(intervals, name="a", ordered=True),

pandas/tests/indexes/interval/test_astype.py

@@ -117,7 +117,7 @@ def test_subtype_integer(self, subtype_start, subtype_end):
     @pytest.mark.xfail(reason="GH#15832")
     def test_subtype_integer_errors(self):
         # int64 -> uint64 fails with negative values
-        index = interval_range(-10, 10, inclusive="right")
+        index = interval_range(-10, 10)
         dtype = IntervalDtype("uint64", "right")
 
         # Until we decide what the exception message _should_ be, we
@@ -133,7 +133,7 @@ class TestFloatSubtype(AstypeTests):
     """Tests specific to IntervalIndex with float subtype"""
 
     indexes = [
-        interval_range(-10.0, 10.0, inclusive="neither"),
+        interval_range(-10.0, 10.0, closed="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"
         ),
@@ -170,7 +170,7 @@ def test_subtype_integer_with_non_integer_borders(self, subtype):
 
     def test_subtype_integer_errors(self):
         # float64 -> uint64 fails with negative values
-        index = interval_range(-10.0, 10.0, inclusive="right")
+        index = interval_range(-10.0, 10.0)
         dtype = IntervalDtype("uint64", "right")
         msg = re.escape(
             "Cannot convert interval[float64, right] to interval[uint64, right]; "
@@ -191,10 +191,10 @@ class TestDatetimelikeSubtype(AstypeTests):
     """Tests specific to IntervalIndex with datetime-like subtype"""
 
     indexes = [
-        interval_range(Timestamp("2018-01-01"), periods=10, inclusive="neither"),
+        interval_range(Timestamp("2018-01-01"), periods=10, closed="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, inclusive="both"),
+        interval_range(Timedelta("0 days"), periods=10, closed="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, 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"),
+            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"),
         ],
     )
     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, inclusive=closed, name=name)
+        index = interval_range(0, 5, closed=closed, name=name)
         result = index.set_closed(new_closed)
-        expected = interval_range(0, 5, inclusive=new_closed, name=name)
+        expected = interval_range(0, 5, closed=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, inclusive=closed
+            start=start, end=end, freq=freq, name=name, closed=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from start/periods/freq
         result = interval_range(
-            start=start, periods=periods, freq=freq, name=name, inclusive=closed
+            start=start, periods=periods, freq=freq, name=name, closed=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from end/periods/freq
         result = interval_range(
-            end=end, periods=periods, freq=freq, name=name, inclusive=closed
+            end=end, periods=periods, freq=freq, name=name, closed=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, inclusive=closed
+            start=start, end=end, periods=periods, name=name, closed=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, inclusive=closed
+            start=start, end=end, freq=freq, name=name, closed=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from start/periods/freq
         result = interval_range(
-            start=start, periods=periods, freq=freq, name=name, inclusive=closed
+            start=start, periods=periods, freq=freq, name=name, closed=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from end/periods/freq
         result = interval_range(
-            end=end, periods=periods, freq=freq, name=name, inclusive=closed
+            end=end, periods=periods, freq=freq, name=name, closed=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, inclusive=closed
+                start=start, end=end, periods=periods, name=name, closed=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, inclusive=closed
+            start=start, end=end, freq=freq, name=name, closed=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from start/periods/freq
         result = interval_range(
-            start=start, periods=periods, freq=freq, name=name, inclusive=closed
+            start=start, periods=periods, freq=freq, name=name, closed=closed
         )
         tm.assert_index_equal(result, expected)
 
         # defined from end/periods/freq
         result = interval_range(
-            end=end, periods=periods, freq=freq, name=name, inclusive=closed
+            end=end, periods=periods, freq=freq, name=name, closed=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, inclusive=closed
+            start=start, end=end, periods=periods, name=name, closed=closed
         )
         tm.assert_index_equal(result, expected)
 
@@ -163,9 +163,7 @@ def test_no_invalid_float_truncation(self, start, end, freq):
             breaks = [0.5, 2.0, 3.5, 5.0, 6.5]
         expected = IntervalIndex.from_breaks(breaks)
 
-        result = interval_range(
-            start=start, end=end, periods=4, freq=freq, inclusive="right"
-        )
+        result = interval_range(start=start, end=end, periods=4, freq=freq)
         tm.assert_index_equal(result, expected)
 
     @pytest.mark.parametrize(
@@ -186,7 +184,7 @@ def test_no_invalid_float_truncation(self, start, end, freq):
     def test_linspace_dst_transition(self, start, mid, end):
         # GH 20976: linspace behavior defined from start/end/periods
         # accounts for the hour gained/lost during DST transition
-        result = interval_range(start=start, end=end, periods=2, inclusive="right")
+        result = interval_range(start=start, end=end, periods=2)
         expected = IntervalIndex.from_breaks([start, mid, end])
         tm.assert_index_equal(result, expected)
 
@@ -355,17 +353,3 @@ def test_errors(self):
         msg = "Start and end cannot both be tz-aware with different timezones"
         with pytest.raises(TypeError, match=msg):
             interval_range(start=start, end=end)
-
-    def test_interval_range_error_and_warning(self):
-        # GH 40245
-
-        msg = (
-            "Deprecated argument `closed` cannot "
-            "be passed if argument `inclusive` is not None"
-        )
-        with pytest.raises(ValueError, match=msg):
-            interval_range(end=5, periods=4, closed="both", inclusive="both")
-
-        msg = "Argument `closed` is deprecated in favor of `inclusive`"
-        with tm.assert_produces_warning(FutureWarning, match=msg):
-            interval_range(end=5, periods=4, closed="right")

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, inclusive=closed)
+        other = interval_range(Timestamp("20180101"), periods=9, closed=closed)
         expected = getattr(index.astype(object), op_name)(other, sort=sort)
         if op_name == "difference":
             expected = index