Skip to content

Commit fd7dfa0

Browse files
authored
[geopandas] Unpin pandas-stubs (#15134)
1 parent 027600d commit fd7dfa0

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

stubs/geopandas/METADATA.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version = "1.1.1"
22
# Requires a version of numpy with a `py.typed` file
3-
requires = ["numpy>=1.20", "pandas-stubs<2.3.3.251201", "types-shapely", "pyproj"]
3+
requires = ["numpy>=1.20", "pandas-stubs", "types-shapely", "pyproj"]
44
upstream_repository = "https://github.com/geopandas/geopandas"
55

66
[tool.stubtest]

stubs/geopandas/geopandas/array.pyi

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import builtins
22
from _typeshed import Incomplete, Unused
3-
from collections.abc import Callable, Collection, Sequence
3+
from collections.abc import Callable, Collection
44
from typing import Any, ClassVar, Final, Literal, NoReturn, SupportsIndex, TypeVar, overload
55
from typing_extensions import Self, TypeAlias, deprecated
66

77
import numpy as np
88
import pandas as pd
99
from numpy.typing import ArrayLike, DTypeLike, NDArray
10+
from pandas._typing import ScalarIndexer, SequenceIndexer, TakeIndexer
1011
from pandas.api.extensions import ExtensionArray, ExtensionDtype
1112
from pyproj import CRS, Transformer
1213
from shapely import Geometry
@@ -68,15 +69,9 @@ class GeometryArray(ExtensionArray):
6869
def __len__(self) -> int: ...
6970
# np.integer[Any] because precision is not important
7071
@overload
71-
def __getitem__(self, idx: int | np.integer[Any]) -> BaseGeometry: ... # Always 1-D, doesn't accept tuple
72+
def __getitem__(self, idx: ScalarIndexer) -> BaseGeometry: ... # Always 1-D, doesn't accept tuple
7273
@overload
73-
def __getitem__(
74-
self, idx: slice | Sequence[SupportsIndex] | NDArray[np.bool_] | NDArray[np.integer[Any]]
75-
) -> GeometryArray: ...
76-
@overload
77-
def __getitem__(
78-
self, idx: int | np.integer[Any] | slice | Sequence[int] | NDArray[np.bool_] | NDArray[np.integer[Any]]
79-
) -> BaseGeometry | GeometryArray: ...
74+
def __getitem__(self, idx: SequenceIndexer) -> GeometryArray: ...
8075
def __setitem__(
8176
self, key, value: _ArrayOrGeom | pd.DataFrame | pd.Series[Any] # Cannot use pd.Series[BaseGeometry]
8277
) -> None: ...
@@ -222,17 +217,15 @@ class GeometryArray(ExtensionArray):
222217
@property
223218
def ndim(self) -> Literal[1]: ...
224219
def copy(self, *args: Unused, **kwargs: Unused) -> GeometryArray: ...
225-
def take(
226-
self, indices: Sequence[SupportsIndex] | NDArray[np.integer], allow_fill: bool = False, fill_value: Geometry | None = None
227-
) -> GeometryArray: ...
228-
def fillna(
220+
def take(self, indices: TakeIndexer, allow_fill: bool = False, fill_value: Geometry | None = None) -> GeometryArray: ...
221+
def fillna( # type: ignore[override]
229222
self,
230223
value: Geometry | GeometryArray | None = None,
231224
method: Literal["backfill", "bfill", "pad", "ffill"] | None = None,
232225
limit: int | None = None,
233226
copy: bool = True,
234227
) -> GeometryArray: ...
235-
@overload
228+
@overload # type: ignore[override]
236229
def astype(self, dtype: GeometryDtype, copy: bool = True) -> GeometryArray: ...
237230
@overload
238231
def astype(self, dtype: ExtensionDtype | Literal["string"], copy: bool = True) -> ExtensionArray: ... # type: ignore[overload-overlap]

0 commit comments

Comments
 (0)