Merge cleanup

Author: rhshadrach

pandas/core/series.py

@@ -4651,7 +4651,7 @@ def rename(
         inplace: Literal[True],
         level: Level | None = ...,
         errors: IgnoreRaise = ...,
-    ) -> Series | None: ...
+    ) -> None: ...
 
     @overload
     def rename(
@@ -4665,6 +4665,18 @@ def rename(
         errors: IgnoreRaise = ...,
     ) -> Series: ...
 
+    @overload
+    def rename(
+        self,
+        index: Renamer | Hashable | None = ...,
+        *,
+        axis: Axis | None = ...,
+        copy: bool | lib.NoDefault = ...,
+        inplace: bool = ...,
+        level: Level | None = ...,
+        errors: IgnoreRaise = ...,
+    ) -> Series | None: ...
+
     def rename(
         self,
         index: Renamer | Hashable | None = None,
@@ -4722,9 +4734,8 @@ def rename(
 
         Returns
         -------
-        Series
-            A shallow copy with index labels or name altered, or the same object
-            if ``inplace=True`` and index is not a dict or callable else None.
+        Series or None
+            Series with index labels or name altered or None if ``inplace=True``.
 
         See Also
         --------

pandas/tests/groupby/test_reductions.py

@@ -961,7 +961,7 @@ def test_min_empty_string_dtype(func, string_dtype_no_object):
 def test_string_dtype_all_na(
     string_dtype_no_object, reduction_func, skipna, min_count, test_series
 ):
-    # https://github.com/pandas-dev/pandas/issues/60229
+    # https://github.com/pandas-dev/pandas/issues/60985
     if reduction_func == "corrwith":
         # corrwith is deprecated.
         return