fix merge

Author: twoertwein

pandas-stubs/_typing.pyi

@@ -137,7 +137,7 @@ IntDtypeArg: TypeAlias = (
 )
 UIntDtypeArg: TypeAlias = (
     # Pandas nullable unsigned integer types and their string aliases
-    pd.UInt8Dtype  # noqa: Y030
+    pd.UInt8Dtype  # noqa: PYI030
     | pd.UInt16Dtype
     | pd.UInt32Dtype
     | pd.UInt64Dtype
@@ -164,15 +164,6 @@ UIntDtypeArg: TypeAlias = (
     # PyArrow unsigned integer types and their string aliases
     | Literal["uint8[pyarrow]", "uint16[pyarrow]", "uint32[pyarrow]", "uint64[pyarrow]"]
 )
-StrDtypeArg: TypeAlias = (
-    # Builtin str type and its string alias
-    type[str]  # noqa: PYI030
-    | Literal["str"]
-    # Pandas nullable string type and its string alias
-    | pd.StringDtype
-    | Literal["string"]
-)
-BytesDtypeArg: TypeAlias = type[bytes]
 FloatDtypeArg: TypeAlias = (
     # Builtin float type and its string alias
     type[float]  # noqa: PYI030
@@ -335,7 +326,7 @@ TimestampDtypeArg: TypeAlias = Literal[
 
 StrDtypeArg: TypeAlias = (
     # Builtin str type and its string alias
-    type[str]  # noqa: Y030
+    type[str]  # noqa: PYI030
     | Literal["str"]
     # Pandas nullable string type and its string alias
     | pd.StringDtype
@@ -349,7 +340,7 @@ StrDtypeArg: TypeAlias = (
 )
 BytesDtypeArg: TypeAlias = (
     # Builtin bytes type and its string alias
-    type[bytes]  # noqa: Y030
+    type[bytes]  # noqa: PYI030
     | Literal["bytes"]
     # Numpy bytes type and its string alias
     # https://numpy.org/doc/stable/reference/arrays.scalars.html#numpy.bytes_
@@ -362,7 +353,7 @@ CategoryDtypeArg: TypeAlias = CategoricalDtype | Literal["category"]
 
 ObjectDtypeArg: TypeAlias = (
     # Builtin object type and its string alias
-    type[object]  # noqa: Y030
+    type[object]  # noqa: PYI030
     | Literal["object"]
     # Numpy object type and its string alias
     # https://numpy.org/doc/stable/reference/arrays.scalars.html#numpy.object_

tests/test_series.py

@@ -2568,17 +2568,17 @@ def test_all_astype_args_tested() -> None:
     }
     TESTED_ASTYPE_ARGS: list[tuple[Any, type]] = (
         ASTYPE_BOOL_ARGS
-        + ASTYPE_INT_ARGS  # noqa: W503
-        + ASTYPE_UINT_ARGS  # noqa: W503
-        + ASTYPE_FLOAT_ARGS  # noqa: W503
-        + ASTYPE_COMPLEX_ARGS  # noqa: W503
-        + ASTYPE_TIMEDELTA_ARGS  # noqa: W503
-        + ASTYPE_TIMESTAMP_ARGS  # noqa: W503
-        + ASTYPE_BYTES_ARGS  # noqa: W503
-        + ASTYPE_STRING_ARGS  # noqa: W503
-        + ASTYPE_CATEGORICAL_ARGS  # noqa: W503
-        + ASTYPE_OBJECT_ARGS  # noqa: W503
-        + ASTYPE_VOID_ARGS  # noqa: W503
+        + ASTYPE_INT_ARGS
+        + ASTYPE_UINT_ARGS
+        + ASTYPE_FLOAT_ARGS
+        + ASTYPE_COMPLEX_ARGS
+        + ASTYPE_TIMEDELTA_ARGS
+        + ASTYPE_TIMESTAMP_ARGS
+        + ASTYPE_BYTES_ARGS
+        + ASTYPE_STRING_ARGS
+        + ASTYPE_CATEGORICAL_ARGS
+        + ASTYPE_OBJECT_ARGS
+        + ASTYPE_VOID_ARGS
     )
 
     TESTED_ALIASES: set[str] = {