Moving skipna after na_action for compatibility with positional args

Author: datapythonista

pandas/core/frame.py

@@ -10643,8 +10643,8 @@ def apply(
     def map(
         self,
         func: PythonFuncType,
-        skipna: bool = False,
         na_action: Literal["ignore"] | None | lib.NoDefault = lib.no_default,
+        skipna: bool = False,
         **kwargs,
     ) -> DataFrame:
         """
@@ -10661,10 +10661,13 @@ def map(
         ----------
         func : callable
             Python function, returns a single value from a single value.
-        skipna : bool = False
-            If ``True``, propagate missing values without passing them to ``func``.
         na_action : {None, 'ignore'}, default None
             If 'ignore', propagate NaN values, without passing them to func.
+
+            .. deprecated:: 3.0.0
+                Use ``skipna`` instead.
+        skipna : bool = False
+            If ``True``, propagate missing values without passing them to ``func``.
         **kwargs
             Additional keyword arguments to pass as keywords arguments to
             `func`.

pandas/core/indexes/base.py

@@ -6353,8 +6353,8 @@ def groupby(self, values) -> PrettyDict[Hashable, Index]:
     def map(
         self,
         mapper,
-        skipna: bool = False,
         na_action: Literal["ignore"] | None | lib.NoDefault = lib.no_default,
+        skipna: bool = False,
     ):
         """
         Map values using an input mapping or function.
@@ -6363,15 +6363,15 @@ def map(
         ----------
         mapper : function, dict, or Series
             Mapping correspondence.
-        skipna : bool = False
-            If ``True``, propagate NA values, without passing them to the
-            mapping correspondence.
         na_action : {None, 'ignore'}
             If 'ignore', propagate NA values, without passing them to the
             mapping correspondence.
 
             .. deprecated:: 3.0.0
                 Use ``skipna`` instead.
+        skipna : bool = False
+            If ``True``, propagate NA values, without passing them to the
+            mapping correspondence.
 
         Returns
         -------

pandas/core/indexes/category.py

@@ -458,8 +458,8 @@ def _is_comparable_dtype(self, dtype: DtypeObj) -> bool:
     def map(
         self,
         mapper,
-        skipna: bool = False,
         na_action: Literal["ignore"] | None | lib.NoDefault = lib.no_default,
+        skipna: bool = False,
     ):
         """
         Map values using input an input mapping or function.
@@ -477,15 +477,15 @@ def map(
         ----------
         mapper : function, dict, or Series
             Mapping correspondence.
-        skipna : bool, default False
-            If ``True``, propagate NaN values, without passing them to
-            the mapping correspondence.
         na_action : {None, 'ignore'}, default 'ignore'
             If 'ignore', propagate NaN values, without passing them to
             the mapping correspondence.
 
             .. deprecated:: 3.0.0
                 Use ``skipna`` instead.
+        skipna : bool, default False
+            If ``True``, propagate NaN values, without passing them to
+            the mapping correspondence.
 
         Returns
         -------

pandas/core/series.py

@@ -4327,8 +4327,8 @@ def unstack(
     def map(
         self,
         func: Callable | Mapping | Series | None = None,
-        skipna: bool = False,
         na_action: Literal["ignore"] | None | lib.NoDefault = lib.no_default,
+        skipna: bool = False,
         engine: Callable | None = None,
         **kwargs,
     ) -> Series:
@@ -4343,15 +4343,15 @@ def map(
         ----------
         func : function, collections.abc.Mapping subclass or Series
             Function or mapping correspondence.
-        skipna : bool, default False
-            If ``True``, do not pass missing values to the function, and
-            propagate them to the result directly instead.
         na_action : {None, 'ignore'}, default None
             If 'ignore', propagate NaN values, without passing them to the
             mapping correspondence.
 
             .. deprecated:: 3.0.0
                 Use ``skipna`` instead.
+        skipna : bool, default False
+            If ``True``, do not pass missing values to the function, and
+            propagate them to the result directly instead.
         engine : decorator, optional
             Choose the execution engine to use to run the function. Only used for
             functions. If ``map`` is called with a mapping or ``Series``, an