From 09eecd8147ff4896c2cab9111a820cd7416d9c92 Mon Sep 17 00:00:00 2001 From: Hrithik Saini <49943287+hrithiksaini99@users.noreply.github.com> Date: Sat, 7 Nov 2026 13:55:54 +0530 Subject: [PATCH 1/2] [rasterio] Support CRS of None and MaskedArray in read(masked=True) (#16504) --- stubs/rasterio/rasterio/_base.pyi | 19 ++---------------- stubs/rasterio/rasterio/_io.pyi | 32 +++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/stubs/rasterio/rasterio/_base.pyi b/stubs/rasterio/rasterio/_base.pyi index 503fc835e84f..8c2a8bfa287f 100644 --- a/stubs/rasterio/rasterio/_base.pyi +++ b/stubs/rasterio/rasterio/_base.pyi @@ -69,47 +69,37 @@ class DatasetBase: def get_nodatavals(self) -> tuple[float | None, ...]: ... @property def nodatavals(self) -> tuple[float | None, ...]: ... - @property def nodata(self) -> float | None: ... @nodata.setter def nodata(self, value: float | None) -> None: ... - @property def mask_flag_enums(self) -> tuple[list[MaskFlags], ...]: ... - @property - def crs(self) -> CRS: ... + def crs(self) -> CRS | None: ... @crs.setter - def crs(self, value: CRSInput) -> None: ... - + def crs(self, value: CRSInput | None) -> None: ... @property def descriptions(self) -> tuple[str | None, ...]: ... @descriptions.setter def descriptions(self, value: Sequence[str | None]) -> None: ... - def write_transform(self, transform: Sequence[float]) -> None: ... - @property def transform(self) -> Affine: ... @transform.setter def transform(self, value: Affine) -> None: ... - @property def offsets(self) -> tuple[float, ...]: ... @offsets.setter def offsets(self, value: Sequence[float]) -> None: ... - @property def scales(self) -> tuple[float, ...]: ... @scales.setter def scales(self, value: Sequence[float]) -> None: ... - @property def units(self) -> tuple[str | None, ...]: ... @units.setter def units(self, value: Sequence[str | None]) -> None: ... - def block_window(self, bidx: int, i: int, j: int) -> Window: ... def block_size(self, bidx: int, i: int, j: int) -> int: ... def block_windows(self, bidx: int = 0) -> Iterable[tuple[tuple[int, int], Window]]: ... @@ -137,27 +127,22 @@ class DatasetBase: def tag_namespaces(self, bidx: int = 0) -> list[str]: ... def tags(self, bidx: int = 0, ns: str | None = None) -> dict[str, str]: ... def get_tag_item(self, ns: str, dm: str | None = None, bidx: int = 0, ovr: int | None = None) -> str | None: ... - @property def colorinterp(self) -> tuple[ColorInterp, ...]: ... @colorinterp.setter def colorinterp(self, value: Sequence[ColorInterp]) -> None: ... - def colormap(self, bidx: int) -> Colormap: ... def overviews(self, bidx: int) -> list[int]: ... def checksum(self, bidx: int, window: Window | None = None) -> int: ... def get_gcps(self) -> tuple[list[GroundControlPoint], CRS]: ... - @property def gcps(self) -> tuple[list[GroundControlPoint], CRS]: ... @gcps.setter def gcps(self, value: tuple[Sequence[GroundControlPoint], CRSInput]) -> None: ... - @property def rpcs(self) -> RPC | None: ... @rpcs.setter def rpcs(self, value: RPC | None) -> None: ... - @property def files(self) -> list[str]: ... diff --git a/stubs/rasterio/rasterio/_io.pyi b/stubs/rasterio/rasterio/_io.pyi index bd0ce16ba759..e49e5cf26fb7 100644 --- a/stubs/rasterio/rasterio/_io.pyi +++ b/stubs/rasterio/rasterio/_io.pyi @@ -1,10 +1,11 @@ import os from collections.abc import Iterator, Sequence -from typing import Any, BinaryIO, Final +from typing import Any, BinaryIO, Final, Literal, overload from typing_extensions import Self, deprecated import numpy as np from affine import Affine as Affine +from numpy.ma import MaskedArray from numpy.typing import DTypeLike, NDArray from rasterio._base import DatasetBase from rasterio._path import _ParsedPath, _UnparsedPath @@ -42,18 +43,45 @@ class Statistics: def __init__(self, min: float, max: float, mean: float, std: float) -> None: ... class DatasetReaderBase(DatasetBase): + @overload def read( self, indexes: Indexes | None = None, out: NDArray[Any] | None = None, window: WindowInput | None = None, - masked: bool = False, + masked: Literal[True] = ..., + out_shape: ShapeND | None = None, + boundless: bool = False, + resampling: Resampling = ..., + fill_value: NumType | None = None, + out_dtype: DTypeLike | None = None, + ) -> MaskedArray[Any, Any]: ... + @overload + def read( + self, + indexes: Indexes | None = None, + out: NDArray[Any] | None = None, + window: WindowInput | None = None, + masked: Literal[False] = False, out_shape: ShapeND | None = None, boundless: bool = False, resampling: Resampling = ..., fill_value: NumType | None = None, out_dtype: DTypeLike | None = None, ) -> NDArray[Any]: ... + @overload + def read( + self, + indexes: Indexes | None = None, + out: NDArray[Any] | None = None, + window: WindowInput | None = None, + masked: bool = False, + out_shape: ShapeND | None = None, + boundless: bool = False, + resampling: Resampling = ..., + fill_value: NumType | None = None, + out_dtype: DTypeLike | None = None, + ) -> NDArray[Any] | MaskedArray[Any, Any]: ... def read_masks( self, indexes: Indexes | None = None, From 89d757d1c52442e64d8bf7201e7013e3a7a5ce78 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 7 Nov 2026 08:28:13 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/rasterio/rasterio/_base.pyi | 15 +++++++++++++++ stubs/rasterio/rasterio/_io.pyi | 1 + 2 files changed, 16 insertions(+) diff --git a/stubs/rasterio/rasterio/_base.pyi b/stubs/rasterio/rasterio/_base.pyi index 8c2a8bfa287f..59bc22d190aa 100644 --- a/stubs/rasterio/rasterio/_base.pyi +++ b/stubs/rasterio/rasterio/_base.pyi @@ -69,37 +69,47 @@ class DatasetBase: def get_nodatavals(self) -> tuple[float | None, ...]: ... @property def nodatavals(self) -> tuple[float | None, ...]: ... + @property def nodata(self) -> float | None: ... @nodata.setter def nodata(self, value: float | None) -> None: ... + @property def mask_flag_enums(self) -> tuple[list[MaskFlags], ...]: ... + @property def crs(self) -> CRS | None: ... @crs.setter def crs(self, value: CRSInput | None) -> None: ... + @property def descriptions(self) -> tuple[str | None, ...]: ... @descriptions.setter def descriptions(self, value: Sequence[str | None]) -> None: ... + def write_transform(self, transform: Sequence[float]) -> None: ... + @property def transform(self) -> Affine: ... @transform.setter def transform(self, value: Affine) -> None: ... + @property def offsets(self) -> tuple[float, ...]: ... @offsets.setter def offsets(self, value: Sequence[float]) -> None: ... + @property def scales(self) -> tuple[float, ...]: ... @scales.setter def scales(self, value: Sequence[float]) -> None: ... + @property def units(self) -> tuple[str | None, ...]: ... @units.setter def units(self, value: Sequence[str | None]) -> None: ... + def block_window(self, bidx: int, i: int, j: int) -> Window: ... def block_size(self, bidx: int, i: int, j: int) -> int: ... def block_windows(self, bidx: int = 0) -> Iterable[tuple[tuple[int, int], Window]]: ... @@ -127,22 +137,27 @@ class DatasetBase: def tag_namespaces(self, bidx: int = 0) -> list[str]: ... def tags(self, bidx: int = 0, ns: str | None = None) -> dict[str, str]: ... def get_tag_item(self, ns: str, dm: str | None = None, bidx: int = 0, ovr: int | None = None) -> str | None: ... + @property def colorinterp(self) -> tuple[ColorInterp, ...]: ... @colorinterp.setter def colorinterp(self, value: Sequence[ColorInterp]) -> None: ... + def colormap(self, bidx: int) -> Colormap: ... def overviews(self, bidx: int) -> list[int]: ... def checksum(self, bidx: int, window: Window | None = None) -> int: ... def get_gcps(self) -> tuple[list[GroundControlPoint], CRS]: ... + @property def gcps(self) -> tuple[list[GroundControlPoint], CRS]: ... @gcps.setter def gcps(self, value: tuple[Sequence[GroundControlPoint], CRSInput]) -> None: ... + @property def rpcs(self) -> RPC | None: ... @rpcs.setter def rpcs(self, value: RPC | None) -> None: ... + @property def files(self) -> list[str]: ... diff --git a/stubs/rasterio/rasterio/_io.pyi b/stubs/rasterio/rasterio/_io.pyi index e49e5cf26fb7..201e4205aefd 100644 --- a/stubs/rasterio/rasterio/_io.pyi +++ b/stubs/rasterio/rasterio/_io.pyi @@ -82,6 +82,7 @@ class DatasetReaderBase(DatasetBase): fill_value: NumType | None = None, out_dtype: DTypeLike | None = None, ) -> NDArray[Any] | MaskedArray[Any, Any]: ... + def read_masks( self, indexes: Indexes | None = None,