Revert "Revert inclusive default change of IntervalDtype (pandas-dev#47367)"

This reverts commit d9dd128.

Author: mroeschke

doc/source/reference/arrays.rst

@@ -304,7 +304,6 @@ Properties
    :toctree: api/
 
    Interval.inclusive
-   Interval.closed
    Interval.closed_left
    Interval.closed_right
    Interval.is_empty

pandas/_libs/interval.pyi

@@ -63,8 +63,6 @@ class Interval(IntervalMixin, Generic[_OrderableT]):
     def right(self: Interval[_OrderableT]) -> _OrderableT: ...
     @property
     def inclusive(self) -> IntervalClosedType: ...
-    @property
-    def closed(self) -> IntervalClosedType: ...
     mid: _MidDescriptor
     length: _LengthDescriptor
     def __init__(

pandas/_libs/interval.pyx

@@ -10,8 +10,6 @@ from cpython.datetime cimport (
     import_datetime,
 )
 
-from pandas.util._exceptions import find_stack_level
-
 import_datetime()
 
 cimport cython
@@ -233,7 +231,7 @@ def _warning_interval(inclusive: str | None = None, closed: None | lib.NoDefault
             stacklevel=2,
         )
         if closed is None:
-            inclusive = "right"
+            inclusive = "both"
         elif closed in ("both", "neither", "left", "right"):
             inclusive = closed
         else:
@@ -370,7 +368,7 @@ cdef class Interval(IntervalMixin):
         inclusive, closed = _warning_interval(inclusive, closed)
 
         if inclusive is None:
-            inclusive = "right"
+            inclusive = "both"
 
         if inclusive not in VALID_CLOSED:
             raise ValueError(f"invalid option for 'inclusive': {inclusive}")
@@ -385,22 +383,6 @@ cdef class Interval(IntervalMixin):
         self.right = right
         self.inclusive = inclusive
 
-    @property
-    def closed(self):
-        """
-        String describing the inclusive side the intervals.
-
-        .. deprecated:: 1.5.0
-
-        Either ``left``, ``right``, ``both`` or ``neither``.
-        """
-        warnings.warn(
-            "Attribute `closed` is deprecated in favor of `inclusive`.",
-            FutureWarning,
-            stacklevel=find_stack_level(inspect.currentframe()),
-        )
-        return self.inclusive
-
     def _validate_endpoint(self, endpoint):
         # GH 23013
         if not (is_integer_object(endpoint) or is_float_object(endpoint) or

pandas/_libs/intervaltree.pxi.in

@@ -69,7 +69,7 @@ cdef class IntervalTree(IntervalMixin):
         inclusive, closed = _warning_interval(inclusive, closed)
 
         if inclusive is None:
-            inclusive = "right"
+            inclusive = "both"
 
         if inclusive not in ['left', 'right', 'both', 'neither']:
             raise ValueError("invalid option for 'inclusive': %s" % inclusive)

pandas/core/arrays/interval.py

@@ -16,7 +16,6 @@
     cast,
     overload,
 )
-import warnings
 
 import numpy as np
 
@@ -27,6 +26,7 @@
     VALID_CLOSED,
     Interval,
     IntervalMixin,
+    _warning_interval,
     intervals_to_interval_bounds,
 )
 from pandas._libs.missing import NA
@@ -44,10 +44,8 @@
 from pandas.errors import IntCastingNaNError
 from pandas.util._decorators import (
     Appender,
-    deprecate_kwarg,
     deprecate_nonkeyword_arguments,
 )
-from pandas.util._exceptions import find_stack_level
 
 from pandas.core.dtypes.cast import LossySetitemError
 from pandas.core.dtypes.common import (
@@ -226,15 +224,16 @@ def ndim(self) -> Literal[1]:
     # ---------------------------------------------------------------------
     # Constructors
 
-    @deprecate_kwarg(old_arg_name="closed", new_arg_name="inclusive")
     def __new__(
         cls: type[IntervalArrayT],
         data,
         inclusive: str | None = None,
+        closed: None | lib.NoDefault = lib.no_default,
         dtype: Dtype | None = None,
         copy: bool = False,
         verify_integrity: bool = True,
     ):
+        inclusive, closed = _warning_interval(inclusive, closed)
 
         data = extract_array(data, extract_numpy=True)
 
@@ -272,22 +271,24 @@ def __new__(
         )
 
     @classmethod
-    @deprecate_kwarg(old_arg_name="closed", new_arg_name="inclusive")
     def _simple_new(
         cls: type[IntervalArrayT],
         left,
         right,
         inclusive=None,
+        closed: None | lib.NoDefault = lib.no_default,
         copy: bool = False,
         dtype: Dtype | None = None,
         verify_integrity: bool = True,
     ) -> IntervalArrayT:
         result = IntervalMixin.__new__(cls)
 
+        inclusive, closed = _warning_interval(inclusive, closed)
+
         if inclusive is None and isinstance(dtype, IntervalDtype):
             inclusive = dtype.inclusive
 
-        inclusive = inclusive or "right"
+        inclusive = inclusive or "both"
 
         left = ensure_index(left, copy=copy)
         right = ensure_index(right, copy=copy)
@@ -427,17 +428,13 @@ def _from_factorized(
             ),
         }
     )
-    @deprecate_kwarg(old_arg_name="closed", new_arg_name="inclusive")
     def from_breaks(
         cls: type[IntervalArrayT],
         breaks,
-        inclusive: IntervalClosedType | None = None,
+        inclusive="both",
         copy: bool = False,
         dtype: Dtype | None = None,
     ) -> IntervalArrayT:
-        if inclusive is None:
-            inclusive = "right"
-
         breaks = _maybe_convert_platform_interval(breaks)
 
         return cls.from_arrays(
@@ -508,19 +505,14 @@ def from_breaks(
             ),
         }
     )
-    @deprecate_kwarg(old_arg_name="closed", new_arg_name="inclusive")
     def from_arrays(
         cls: type[IntervalArrayT],
         left,
         right,
-        inclusive: IntervalClosedType | None = None,
+        inclusive="both",
         copy: bool = False,
         dtype: Dtype | None = None,
     ) -> IntervalArrayT:
-
-        if inclusive is None:
-            inclusive = "right"
-
         left = _maybe_convert_platform_interval(left)
         right = _maybe_convert_platform_interval(right)
 
@@ -582,17 +574,13 @@ def from_arrays(
             ),
         }
     )
-    @deprecate_kwarg(old_arg_name="closed", new_arg_name="inclusive")
     def from_tuples(
         cls: type[IntervalArrayT],
         data,
-        inclusive=None,
+        inclusive="both",
         copy: bool = False,
         dtype: Dtype | None = None,
     ) -> IntervalArrayT:
-        if inclusive is None:
-            inclusive = "right"
-
         if len(data):
             left, right = [], []
         else:
@@ -1368,20 +1356,6 @@ def inclusive(self) -> IntervalClosedType:
         """
         return self.dtype.inclusive
 
-    @property
-    def closed(self) -> IntervalClosedType:
-        """
-        String describing the inclusive side the intervals.
-
-        Either ``left``, ``right``, ``both`` or ``neither`.
-        """
-        warnings.warn(
-            "Attribute `closed` is deprecated in favor of `inclusive`.",
-            FutureWarning,
-            stacklevel=find_stack_level(inspect.currentframe()),
-        )
-        return self.dtype.inclusive
-
     _interval_shared_docs["set_closed"] = textwrap.dedent(
         """
         Return an identical %(klass)s closed on the specified side.
@@ -1421,7 +1395,6 @@ def closed(self) -> IntervalClosedType:
             ),
         }
     )
-    @deprecate_kwarg(old_arg_name="closed", new_arg_name="inclusive")
     def set_closed(
         self: IntervalArrayT, inclusive: IntervalClosedType
     ) -> IntervalArrayT:

pandas/core/dtypes/dtypes.py

@@ -11,7 +11,6 @@
     MutableMapping,
     cast,
 )
-import warnings
 
 import numpy as np
 import pytz
@@ -43,7 +42,6 @@
     npt,
     type_t,
 )
-from pandas.util._exceptions import find_stack_level
 
 from pandas.core.dtypes.base import (
     ExtensionDtype,
@@ -1185,15 +1183,6 @@ def _can_hold_na(self) -> bool:
     def inclusive(self):
         return self._closed
 
-    @property
-    def closed(self):
-        warnings.warn(
-            "Attribute `closed` is deprecated in favor of `inclusive`.",
-            FutureWarning,
-            stacklevel=find_stack_level(inspect.currentframe()),
-        )
-        return self._closed
-
     @property
     def subtype(self):
         """