MNT: compatibility with pandas>=2.1.0 and upcoming deprecations

theOehrly · Oct 19, 2023 · 1976e59 · 1976e59
1 parent 97c4ec8
commit 1976e59
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 54 deletions.
diff --git a/fastf1/core.py b/fastf1/core.py
@@ -210,10 +210,7 @@ def __init__(self,
 
     @property
     def _constructor(self):
-        def _new(*args, **kwargs):
-            return Telemetry(*args, **kwargs).__finalize__(self)
-
-        return _new
+        return Telemetry
 
     @property
     def base_class_view(self):
@@ -1579,7 +1576,8 @@ def _fix_missing_laps_retired_on_track(self):
             })
 
             # add generated laps at the end and fix sorting at the end
-            self._laps = pd.concat([self._laps, new_last])
+            self._laps = (pd.concat([self._laps, new_last])
+                          .__finalize__(self._laps))
             any_new = True
 
         if any_new:
@@ -2434,23 +2432,21 @@ def __init__(self,
 
     @property
     def _constructor(self):
-        def _new(*args, **kwargs):
-            return Laps(*args, **kwargs).__finalize__(self)
-
-        return _new
+        return Laps
 
     @property
     def _constructor_sliced(self):
-        def _new(*args, **kwargs):
-            name = kwargs.get('name')
-            if name and (name in self.columns):
-                # vertical slice
-                return pd.Series(*args, **kwargs).__finalize__(self)
+        return Lap
 
+    def _constructor_sliced_from_mgr(self, mgr, axes):
+        if axes[0] is self.index:
             # horizontal slice
-            return Lap(*args, **kwargs).__finalize__(self)
+            ser = pd.Series._from_mgr(mgr, axes)
+            ser._name = None  # caller is responsible for setting real name
+            return ser
 
-        return _new
+        # vertical slice
+        return super()._constructor_sliced_from_mgr(mgr, axes)
 
     @property
     def base_class_view(self):
@@ -3387,23 +3383,21 @@ def __repr__(self):
 
     @property
     def _constructor(self):
-        def _new(*args, **kwargs):
-            return SessionResults(*args, **kwargs).__finalize__(self)
-
-        return _new
+        return SessionResults
 
     @property
     def _constructor_sliced(self):
-        def _new(*args, **kwargs):
-            name = kwargs.get('name')
-            if name and (name in self.columns):
-                # vertical slice
-                return pd.Series(*args, **kwargs).__finalize__(self)
+        return DriverResult
 
+    def _constructor_sliced_from_mgr(self, mgr, axes):
+        if axes[0] is self.index:
             # horizontal slice
-            return DriverResult(*args, **kwargs).__finalize__(self)
+            ser = pd.Series._from_mgr(mgr, axes)
+            ser._name = None  # caller is responsible for setting real name
+            return ser
 
-        return _new
+        # vertical slice
+        return super()._constructor_sliced_from_mgr(mgr, axes)
 
     @property
     def base_class_view(self):

diff --git a/fastf1/ergast/interface.py b/fastf1/ergast/interface.py
@@ -165,23 +165,21 @@ def _flatten_element(cls, nested: dict, category: dict, cast: bool):
 
     @property
     def _constructor(self):
-        def _new(*args, **kwargs):
-            return ErgastResultFrame(*args, **kwargs).__finalize__(self)
-
-        return _new
+        return ErgastResultFrame
 
     @property
     def _constructor_sliced(self):
-        def _new(*args, **kwargs):
-            name = kwargs.get('name')
-            if name and (name in self.columns):
-                # vertical slice
-                return pd.Series(*args, **kwargs).__finalize__(self)
+        return ErgastResultSeries
 
+    def _constructor_sliced_from_mgr(self, mgr, axes):
+        if axes[0] is self.index:
             # horizontal slice
-            return ErgastResultSeries(*args, **kwargs).__finalize__(self)
+            ser = pd.Series._from_mgr(mgr, axes)
+            ser._name = None  # caller is responsible for setting real name
+            return ser
 
-        return _new
+        # vertical slice
+        return super()._constructor_sliced_from_mgr(mgr, axes)
 
     @property
     def base_class_view(self):
@@ -202,10 +200,7 @@ def __init__(self, *args, **kwargs):
 
     @property
     def _constructor(self):
-        def _new(*args, **kwargs):
-            return ErgastResultSeries(*args, **kwargs).__finalize__(self)
-
-        return _new
+        return ErgastResultSeries
 
 
 class ErgastRawResponse(ErgastResponseMixin, list):

diff --git a/fastf1/events.py b/fastf1/events.py
@@ -801,17 +801,21 @@ def __repr__(self):
 
     @property
     def _constructor(self):
-        def _new(*args, **kwargs):
-            return EventSchedule(*args, **kwargs).__finalize__(self)
-
-        return _new
+        return EventSchedule
 
     @property
     def _constructor_sliced(self):
-        def _new(*args, **kwargs):
-            return Event(*args, **kwargs).__finalize__(self)
+        return Event
+
+    def _constructor_sliced_from_mgr(self, mgr, axes):
+        if axes[0] is self.index:
+            # horizontal slice
+            ser = pd.Series._from_mgr(mgr, axes)
+            ser._name = None  # caller is responsible for setting real name
+            return ser
 
-        return _new
+        # vertical slice
+        return super()._constructor_sliced_from_mgr(mgr, axes)
 
     @property
     def base_class_view(self):
@@ -942,10 +946,7 @@ def __init__(self, *args, year: int = None, **kwargs):
 
     @property
     def _constructor(self):
-        def _new(*args, **kwargs):
-            return Event(*args, **kwargs).__finalize__(self)
-
-        return _new
+        return Event
 
     def is_testing(self) -> bool:
         """Return `True` or `False`, depending on whether this event is a

diff --git a/fastf1/tests/test_events.py b/fastf1/tests/test_events.py
@@ -238,3 +238,23 @@ def test_event_get_nonexistent_session_date():
     event = fastf1.get_event(2020, 13)
     with pytest.raises(ValueError, match="does not exist"):
         event.get_session_date('FP2')
+
+
+def test_events_constructors():
+    frame = fastf1.events.EventSchedule({'RoundNumber': [1, 2, 3],
+                                         'Country': ['a', 'b', 'c']})
+
+    # test slicing to frame
+    assert isinstance(frame.iloc[1:], fastf1.events.EventSchedule)
+
+    # test horizontal slicing
+    assert isinstance(frame.iloc[0], fastf1.events.Event)
+    assert isinstance(frame.iloc[0], pd.Series)
+
+    # test vertical slicing
+    assert not isinstance(frame.loc[:, 'Country'], fastf1.events.Event)
+    assert isinstance(frame.loc[:, 'Country'], pd.Series)
+
+    # test base class view
+    assert isinstance(frame.base_class_view, pd.DataFrame)
+    assert not isinstance(frame.base_class_view, fastf1.events.EventSchedule)
diff --git a/setup.cfg b/setup.cfg
@@ -26,7 +26,7 @@ packages =
 python_requires = >= 3.8
 install_requires =
   requests-cache>=0.8.0
-  pandas>=1.2.4,<2.1.0
+  pandas>=1.2.4,<3.0.0
   numpy>=1.20.3,<2.0.0
   scipy>=1.6.3,<2.0.0
   thefuzz