diff --git a/pandas/_testing/__init__.py b/pandas/_testing/__init__.py index eb2905751a9b4..6a7a1c7126cd3 100644 --- a/pandas/_testing/__init__.py +++ b/pandas/_testing/__init__.py @@ -27,6 +27,7 @@ from pandas._typing import ( Dtype, Frequency, + NpDtype, ) from pandas.compat import pa_version_under6p0 @@ -124,12 +125,13 @@ _N = 30 _K = 4 -UNSIGNED_INT_NUMPY_DTYPES: list[Dtype] = ["uint8", "uint16", "uint32", "uint64"] +UNSIGNED_INT_NUMPY_DTYPES: list[NpDtype] = ["uint8", "uint16", "uint32", "uint64"] UNSIGNED_INT_EA_DTYPES: list[Dtype] = ["UInt8", "UInt16", "UInt32", "UInt64"] -SIGNED_INT_NUMPY_DTYPES: list[Dtype] = [int, "int8", "int16", "int32", "int64"] +SIGNED_INT_NUMPY_DTYPES: list[NpDtype] = [int, "int8", "int16", "int32", "int64"] SIGNED_INT_EA_DTYPES: list[Dtype] = ["Int8", "Int16", "Int32", "Int64"] ALL_INT_NUMPY_DTYPES = UNSIGNED_INT_NUMPY_DTYPES + SIGNED_INT_NUMPY_DTYPES ALL_INT_EA_DTYPES = UNSIGNED_INT_EA_DTYPES + SIGNED_INT_EA_DTYPES +ALL_INT_DTYPES: list[Dtype] = [*ALL_INT_NUMPY_DTYPES, *ALL_INT_EA_DTYPES] FLOAT_NUMPY_DTYPES: list[Dtype] = [float, "float32", "float64"] FLOAT_EA_DTYPES: list[Dtype] = ["Float32", "Float64"] diff --git a/pandas/conftest.py b/pandas/conftest.py index 3b167d9ef4fe2..e4e32ab4a7350 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -1486,7 +1486,7 @@ def any_int_ea_dtype(request): return request.param -@pytest.fixture(params=tm.ALL_INT_NUMPY_DTYPES + tm.ALL_INT_EA_DTYPES) +@pytest.fixture(params=tm.ALL_INT_DTYPES) def any_int_dtype(request): """ Parameterized fixture for any nullable integer dtype.