From bf5db94fee2aef3f15fff37be4b42049d8957aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Diridollou?= Date: Tue, 20 May 2025 21:18:09 -0400 Subject: [PATCH 1/3] GH1227 Align __init__ file content with pandas --- pandas-stubs/api/__init__.pyi | 1 + pandas-stubs/io/__init__.pyi | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/pandas-stubs/api/__init__.pyi b/pandas-stubs/api/__init__.pyi index 61e0b3529..468874a73 100644 --- a/pandas-stubs/api/__init__.pyi +++ b/pandas-stubs/api/__init__.pyi @@ -1,4 +1,5 @@ from pandas.api import ( + executors as executors, extensions as extensions, indexers as indexers, interchange as interchange, diff --git a/pandas-stubs/io/__init__.pyi b/pandas-stubs/io/__init__.pyi index e69de29bb..2bc0236dc 100644 --- a/pandas-stubs/io/__init__.pyi +++ b/pandas-stubs/io/__init__.pyi @@ -0,0 +1,5 @@ +from pandas.io import ( + formats as formats, + json as json, + stata as stata, +) From 39d00191564722b60f8910720ba42c5e072a9503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Diridollou?= Date: Tue, 20 May 2025 21:52:33 -0400 Subject: [PATCH 2/3] GH1227 Align __init__.pyi with __init__.py --- pandas-stubs/_config/__init__.pyi | 2 +- pandas-stubs/api/__init__.pyi | 1 - pandas-stubs/api/extensions/__init__.pyi | 2 +- pandas-stubs/api/indexers/__init__.pyi | 4 ++-- pandas-stubs/core/dtypes/base.pyi | 5 +++++ pandas-stubs/core/dtypes/dtypes.pyi | 10 ++++------ pandas-stubs/core/interchange/__init__.pyi | 2 ++ pandas-stubs/io/formats/__init__.pyi | 1 + pandas-stubs/io/json/__init__.pyi | 7 ++++++- 9 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pandas-stubs/_config/__init__.pyi b/pandas-stubs/_config/__init__.pyi index f9cb092a8..4451d0615 100644 --- a/pandas-stubs/_config/__init__.pyi +++ b/pandas-stubs/_config/__init__.pyi @@ -1,4 +1,4 @@ -from .config import ( +from pandas._config.config import ( describe_option as describe_option, get_option as get_option, option_context as option_context, diff --git a/pandas-stubs/api/__init__.pyi b/pandas-stubs/api/__init__.pyi index 468874a73..61e0b3529 100644 --- a/pandas-stubs/api/__init__.pyi +++ b/pandas-stubs/api/__init__.pyi @@ -1,5 +1,4 @@ from pandas.api import ( - executors as executors, extensions as extensions, indexers as indexers, interchange as interchange, diff --git a/pandas-stubs/api/extensions/__init__.pyi b/pandas-stubs/api/extensions/__init__.pyi index c0971d518..c25a0099a 100644 --- a/pandas-stubs/api/extensions/__init__.pyi +++ b/pandas-stubs/api/extensions/__init__.pyi @@ -11,7 +11,7 @@ from pandas.core.arrays import ( from pandas._libs.lib import no_default as no_default -from pandas.core.dtypes.dtypes import ( +from pandas.core.dtypes.base import ( ExtensionDtype as ExtensionDtype, register_extension_dtype as register_extension_dtype, ) diff --git a/pandas-stubs/api/indexers/__init__.pyi b/pandas-stubs/api/indexers/__init__.pyi index d6d6368d9..c48a71c4b 100644 --- a/pandas-stubs/api/indexers/__init__.pyi +++ b/pandas-stubs/api/indexers/__init__.pyi @@ -1,6 +1,6 @@ -from pandas.core.indexers import ( +from pandas.core.indexers import check_array_indexer as check_array_indexer +from pandas.core.indexers.objects import ( BaseIndexer as BaseIndexer, FixedForwardWindowIndexer as FixedForwardWindowIndexer, VariableOffsetWindowIndexer as VariableOffsetWindowIndexer, - check_array_indexer as check_array_indexer, ) diff --git a/pandas-stubs/core/dtypes/base.pyi b/pandas-stubs/core/dtypes/base.pyi index 41c866f92..ceeb33fad 100644 --- a/pandas-stubs/core/dtypes/base.pyi +++ b/pandas-stubs/core/dtypes/base.pyi @@ -4,6 +4,7 @@ from typing import ( ) from pandas.core.arrays import ExtensionArray +from typing_extensions import TypeVar from pandas._typing import type_t @@ -28,3 +29,7 @@ class ExtensionDtype: def is_dtype(cls, dtype: object) -> bool: ... class StorageExtensionDtype(ExtensionDtype): ... + +_ExtensionDtypeT = TypeVar("_ExtensionDtypeT", bound=ExtensionDtype) + +def register_extension_dtype(cls: type[_ExtensionDtypeT]) -> type[_ExtensionDtypeT]: ... diff --git a/pandas-stubs/core/dtypes/dtypes.pyi b/pandas-stubs/core/dtypes/dtypes.pyi index 8866b20c4..3826e7d2a 100644 --- a/pandas-stubs/core/dtypes/dtypes.pyi +++ b/pandas-stubs/core/dtypes/dtypes.pyi @@ -2,7 +2,6 @@ import datetime as dt from typing import ( Any, Literal, - TypeVar, ) import numpy as np @@ -21,11 +20,10 @@ from pandas._typing import ( npt, ) -from .base import ExtensionDtype as ExtensionDtype - -_ExtensionDtypeT = TypeVar("_ExtensionDtypeT", bound=ExtensionDtype) - -def register_extension_dtype(cls: type[_ExtensionDtypeT]) -> type[_ExtensionDtypeT]: ... +from pandas.core.dtypes.base import ( + ExtensionDtype as ExtensionDtype, + register_extension_dtype as register_extension_dtype, +) class BaseMaskedDtype(ExtensionDtype): ... class PandasExtensionDtype(ExtensionDtype): ... diff --git a/pandas-stubs/core/interchange/__init__.pyi b/pandas-stubs/core/interchange/__init__.pyi index e69de29bb..147ebac46 100644 --- a/pandas-stubs/core/interchange/__init__.pyi +++ b/pandas-stubs/core/interchange/__init__.pyi @@ -0,0 +1,2 @@ +from pandas.core.interchange.dataframe_protocol import DataFrame as DataFrame +from pandas.core.interchange.from_dataframe import from_dataframe as from_dataframe diff --git a/pandas-stubs/io/formats/__init__.pyi b/pandas-stubs/io/formats/__init__.pyi index e69de29bb..253f12ae0 100644 --- a/pandas-stubs/io/formats/__init__.pyi +++ b/pandas-stubs/io/formats/__init__.pyi @@ -0,0 +1 @@ +from pandas.io.formats import style as style diff --git a/pandas-stubs/io/json/__init__.pyi b/pandas-stubs/io/json/__init__.pyi index bb5226fa0..993f8afb4 100644 --- a/pandas-stubs/io/json/__init__.pyi +++ b/pandas-stubs/io/json/__init__.pyi @@ -1,2 +1,7 @@ -from pandas.io.json._json import read_json as read_json +from pandas.io.json._json import ( + read_json as read_json, +) + +# below are untyped imports so commented out +# to_json as to_json,; ujson_dumps as ujson_dumps,; ujson_loads as ujson_loads, from pandas.io.json._table_schema import build_table_schema as build_table_schema From 8f8379e34addbfafeb1ee49e492d1218de5d308e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Diridollou?= Date: Wed, 21 May 2025 17:53:19 -0400 Subject: [PATCH 3/3] GH1227 PR feedback --- pandas-stubs/core/dtypes/base.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas-stubs/core/dtypes/base.pyi b/pandas-stubs/core/dtypes/base.pyi index ceeb33fad..655fba853 100644 --- a/pandas-stubs/core/dtypes/base.pyi +++ b/pandas-stubs/core/dtypes/base.pyi @@ -1,10 +1,10 @@ from typing import ( ClassVar, Literal, + TypeVar, ) from pandas.core.arrays import ExtensionArray -from typing_extensions import TypeVar from pandas._typing import type_t