Make futureproof

partd/pandas.py

@@ -2,14 +2,22 @@
 import pickle
 
 import pandas as pd
+from packaging.version import Version
 
-try:
-    from pandas.core.internals.managers import create_block_manager_from_blocks
-except ImportError:
-    from pandas.core.internals import create_block_manager_from_blocks
+PANDAS_GE_210 = Version(pd.__version__).release >= (2, 1, 0)
+PANDAS_GE_300 =  Version(pd.__version__).major >= 3
 
-from pandas.core.internals import make_block
-from packaging.version import Version
+if PANDAS_GE_300:
+    from pandas.api.internals import create_dataframe_from_blocks
+    create_block_manager_from_blocks= None
+    make_block = None
+else:
+    try:
+        from pandas.core.internals.managers import create_block_manager_from_blocks
+    except ImportError:
+        from pandas.core.internals import create_block_manager_from_blocks
+
+    from pandas.core.internals import make_block
 
 from . import numpy as pnp
 from .core import Interface
@@ -24,7 +32,6 @@ def is_extension_array(x):
 
 dumps = partial(pickle.dumps, protocol=pickle.HIGHEST_PROTOCOL)
 
-PANDAS_GE_210 = Version(pd.__version__).release >= (2, 1, 0)
 
 
 class PandasColumns(Interface):
@@ -142,7 +149,7 @@ def block_to_header_bytes(block):
     return header, bytes
 
 
-def block_from_header_bytes(header, bytes):
+def block_from_header_bytes(header, bytes, create_block: bool):
     placement, dtype, shape, (extension_type, extension_values) = header
 
     if extension_type == "other":
@@ -158,7 +165,9 @@ def block_from_header_bytes(header, bytes):
         tz_info = extension_values[0]
         values = pd.DatetimeIndex(values).tz_localize('utc').tz_convert(
             tz_info)
-    return make_block(values, placement=placement)
+    if create_block:
+        return make_block(values, placement=placement)
+    return values, placement
 
 
 def serialize(df):
@@ -187,9 +196,11 @@ def deserialize(bytes):
     bytes = frames[1:]
     axes = [index_from_header_bytes(headers[0], bytes[0]),
             index_from_header_bytes(headers[1], bytes[1])]
-    blocks = [block_from_header_bytes(h, b)
+    blocks = [block_from_header_bytes(h, b, create_block=not PANDAS_GE_300)
               for (h, b) in zip(headers[2:], bytes[2:])]
-    if PANDAS_GE_210:
+    if PANDAS_GE_300:
+        return pd.api.internals.create_dataframe_from_blocks(blocks, axes[1], axes[0])
+    elif PANDAS_GE_210:
         return pd.DataFrame._from_mgr(create_block_manager_from_blocks(blocks, axes), axes=axes)
     else:
         return pd.DataFrame(create_block_manager_from_blocks(blocks, axes))