resolve apply pandas 2.1 deprecation warning from default val

pandas-dev/pandas#52786

Author: m-richards

geopandas/geoseries.py

@@ -647,8 +647,14 @@ def select(self, *args, **kwargs):
         return self._wrapped_pandas_method("select", *args, **kwargs)
 
     @doc(pd.Series)
-    def apply(self, func, convert_dtype: bool = True, args=(), **kwargs):
-        result = super().apply(func, convert_dtype=convert_dtype, args=args, **kwargs)
+    def apply(self, func, convert_dtype: bool = None, args=(), **kwargs):
+        if convert_dtype is not None:
+            kwargs["convert_dtype"] = convert_dtype
+        elif convert_dtype is None and not compat.PANDAS_GE_21:
+            kwargs["convert_dtype"] = True
+        # if compat.PANDAS_GE_21 don't pass through, use pandas default -> true
+        # to avoid warning
+        result = super().apply(func, args=args, **kwargs)
         if isinstance(result, GeoSeries):
             if self.crs is not None:
                 result.set_crs(self.crs, inplace=True)

geopandas/tests/test_pandas_methods.py

@@ -1,5 +1,9 @@
 import os
+<<<<<<< HEAD
 from packaging.version import Version
+=======
+import warnings
+>>>>>>> 5be79c17... resolve apply pandas 2.1 deprecation warning from default val
 
 import numpy as np
 from numpy.testing import assert_array_equal
@@ -710,6 +714,14 @@ def numeric_func(geom):
     assert not isinstance(result, GeoSeries)
     assert_series_equal(result, pd.Series([0.0, 1.0, 2.0]))
 
+    with warnings.catch_warnings(record=True) as record:
+        s.apply(lambda x: x.centroid, convert_dtype=False)
+    if compat.PANDAS_GE_21:
+        assert len(record) == 1
+        assert "the convert_dtype parameter" in str(record[0].message)
+    else:
+        assert len(record) == 0
+
 
 def test_apply_loc_len1(df):
     # subset of len 1 with loc -> bug in pandas with inconsistent Block ndim