fixup post merge

Author: MarcoGorelli

pandas/core/frame.py

@@ -6301,7 +6301,7 @@ def sort_values(  # type: ignore[override]
         else:
             return result.__finalize__(self, method="sort_values")
 
-    @deprecate_nonkeyword_arguments(version="2.0", allowed_args=["self"])
+    @deprecate_nonkeyword_arguments(version=None, allowed_args=["self"])
     def sort_index(
         self,
         axis: Axis = 0,

pandas/core/series.py

@@ -3435,7 +3435,7 @@ def sort_values(
         else:
             return result.__finalize__(self, method="sort_values")
 
-    @deprecate_nonkeyword_arguments(version="2.0", allowed_args=["self"])
+    @deprecate_nonkeyword_arguments(version=None, allowed_args=["self"])
     def sort_index(
         self,
         axis=0,

pandas/tests/frame/methods/test_sort_index.py

@@ -872,8 +872,8 @@ def test_sort_index_pos_args_deprecation(self):
         # https://github.com/pandas-dev/pandas/issues/41485
         df = DataFrame({"a": [1, 2, 3]})
         msg = (
-            r"Starting with Pandas version 2\.0 all arguments of sort_index "
-            r"except for the argument 'self' will be keyword-only"
+            r"In a future version of pandas all arguments of DataFrame.sort_index "
+            r"will be keyword-only"
         )
         with tm.assert_produces_warning(FutureWarning, match=msg):
             df.sort_index(1)

pandas/tests/series/methods/test_sort_index.py

@@ -325,8 +325,8 @@ def test_sort_index_pos_args_deprecation(self):
         # https://github.com/pandas-dev/pandas/issues/41485
         ser = Series([1, 2, 3])
         msg = (
-            r"Starting with Pandas version 2\.0 all arguments of sort_index "
-            r"except for the argument 'self' will be keyword-only"
+            r"In a future version of pandas all arguments of Series.sort_index "
+            r"will be keyword-only"
         )
         with tm.assert_produces_warning(FutureWarning, match=msg):
             ser.sort_index(0)