[rasterio] 1.5.1 support (BLOCKED)

stubs/rasterio/@tests/stubtest_allowlist.txt

@@ -1,6 +1,5 @@
 # Stubs-only helper modules with no runtime counterpart.
 rasterio\._typing
-rasterio\._affine_types
 
 # Stubs-only type aliases referenced in signatures only.
 rasterio\.merge\.MethodFunction

stubs/rasterio/METADATA.toml

@@ -1,4 +1,7 @@
-version = "1.5.0"
+version = "1.5.1"
 upstream-repository = "https://github.com/rasterio/rasterio"
 requires-python = ">=3.12"
-dependencies = ["numpy>=2", "click>=8"]
+dependencies = ["numpy>=2", "click>=8", "affine>=3"]
+
+[tool.stubtest]
+stubtest-dependencies = ["affine"]

stubs/rasterio/rasterio/_base.pyi

@@ -5,7 +5,7 @@ from types import TracebackType
 from typing import Any, Final
 from typing_extensions import Self, deprecated
 
-from rasterio._affine_types import Affine
+from affine import Affine as Affine
 from rasterio._path import _ParsedPath, _UnparsedPath
 from rasterio._typing import Colormap, CRSInput, _OpenOption
 from rasterio.control import GroundControlPoint

stubs/rasterio/rasterio/_io.pyi

@@ -4,8 +4,8 @@ from typing import Any, BinaryIO, Final
 from typing_extensions import Self, deprecated
 
 import numpy as np
+from affine import Affine as Affine
 from numpy.typing import DTypeLike, NDArray
-from rasterio._affine_types import Affine
 from rasterio._base import DatasetBase
 from rasterio._path import _ParsedPath, _UnparsedPath
 from rasterio._typing import Colormap, CRSInput, Indexes, NumType, ShapeND, WindowInput, _GDALOption, _OpenOption

stubs/rasterio/rasterio/_warp.pyi

@@ -1,8 +1,8 @@
 from collections.abc import Sequence
 from typing import Any, Final
 
+from affine import Affine as Affine
 from numpy.typing import DTypeLike, NDArray
-from rasterio._affine_types import Affine
 from rasterio._io import DatasetReaderBase
 from rasterio._typing import CRSInput, Geometry, Indexes, ShapeND, WindowInput, _GDALOption, _NestedScalar
 from rasterio.control import GroundControlPoint
@@ -14,6 +14,8 @@ from rasterio.rpc import RPC
 SUPPORTED_RESAMPLING: Final[list[Resampling]]
 DEFAULT_NODATA_FLAG: Final[object]
 
+dtype_ranges: dict[str, tuple[float, float]]
+
 def recursive_round(val: _NestedScalar, precision: int) -> _NestedScalar: ...
 def _transform_geom(
     src_crs: CRSInput, dst_crs: CRSInput, geom: Geometry | Sequence[Geometry], precision: int

stubs/rasterio/rasterio/errors.pyi

@@ -16,6 +16,7 @@ class NodataShadowWarning(UserWarning): ...
 class NotGeoreferencedWarning(UserWarning): ...
 class TransformWarning(UserWarning): ...
 class RPCError(ValueError): ...
+class InvalidShapeError(RasterioError, ValueError): ...
 class ShapeSkipWarning(UserWarning): ...
 class GDALBehaviorChangeException(RuntimeError): ...
 class GDALOptionNotImplementedError(RasterioError): ...

stubs/rasterio/rasterio/features.pyi

@@ -5,8 +5,8 @@ from typing import Any, Final, overload
 from typing_extensions import deprecated
 
 import numpy as np
+from affine import Affine as Affine
 from numpy.typing import DTypeLike, NDArray
-from rasterio._affine_types import Affine
 from rasterio._typing import Geometry as Geometry
 from rasterio.enums import MergeAlg as MergeAlg
 from rasterio.io import DatasetReaderBase

stubs/rasterio/rasterio/io.pyi

@@ -3,8 +3,8 @@ from types import TracebackType
 from typing import Any, Final
 from typing_extensions import Self, deprecated
 
+from affine import Affine as Affine
 from numpy.typing import DTypeLike
-from rasterio._affine_types import Affine
 from rasterio._filepath import FilePathBase as FilePathBase
 from rasterio._io import (
     BufferedDatasetWriterBase as BufferedDatasetWriterBase,

stubs/rasterio/rasterio/mask.pyi

@@ -2,8 +2,8 @@ import logging
 from collections.abc import Iterable
 from typing import Any, Final
 
+from affine import Affine as Affine
 from numpy.typing import NDArray
-from rasterio._affine_types import Affine
 from rasterio._typing import Geometry
 from rasterio.errors import WindowError as WindowError
 from rasterio.features import geometry_mask as geometry_mask, geometry_window as geometry_window

stubs/rasterio/rasterio/merge.pyi

@@ -4,8 +4,8 @@ from collections.abc import Callable, Sequence
 from typing import Any, Final, Literal, TypeAlias, overload
 from typing_extensions import deprecated
 
+from affine import Affine as Affine
 from numpy.typing import DTypeLike, NDArray
-from rasterio._affine_types import Affine
 from rasterio.enums import Resampling
 from rasterio.io import DatasetReaderBase
 

stubs/rasterio/rasterio/plot.pyi

@@ -2,8 +2,8 @@ import logging
 from collections.abc import Mapping, Sequence
 from typing import Any, Final, Literal
 
+from affine import Affine as Affine
 from numpy.typing import NDArray
-from rasterio._affine_types import Affine
 from rasterio.io import DatasetReader as DatasetReader
 from rasterio.transform import guard_transform as guard_transform
 
@@ -25,7 +25,7 @@ def show(
     title: str | None = None,
     transform: Affine | None = None,
     percent_range: tuple[float, float] | None = None,
-    adjust: bool = True,
+    adjust: bool = False,
     **kwargs: Any,
 ) -> Any: ...
 def plotting_extent(

stubs/rasterio/rasterio/serde.pyi

@@ -0,0 +1,4 @@
+from functools import singledispatch
+
+@singledispatch
+def to_json(obj: object) -> object: ...

stubs/rasterio/rasterio/stack.pyi

@@ -3,8 +3,8 @@ import os
 from collections.abc import Sequence
 from typing import Any, Final
 
+from affine import Affine as Affine
 from numpy.typing import DTypeLike, NDArray
-from rasterio._affine_types import Affine
 from rasterio.enums import Resampling
 from rasterio.io import DatasetReaderBase
 

stubs/rasterio/rasterio/transform.pyi

@@ -2,7 +2,7 @@ from collections.abc import Callable, Sequence
 from typing import Final, Literal, TypeAlias, overload
 from typing_extensions import Self, deprecated
 
-from rasterio._affine_types import Affine as Affine
+from affine import Affine as Affine
 from rasterio._transform import GCPTransformerBase, RPCTransformerBase
 from rasterio._typing import _GDALOption
 from rasterio.control import GroundControlPoint

stubs/rasterio/rasterio/warp.pyi

@@ -3,8 +3,8 @@ from collections.abc import Mapping, Sequence
 from typing import Any, Final, TypeAlias, overload
 from typing_extensions import deprecated
 
+from affine import Affine as Affine
 from numpy.typing import ArrayLike, NDArray
-from rasterio._affine_types import Affine
 from rasterio._typing import CRSInput, Geometry, _GDALOption
 from rasterio.control import GroundControlPoint
 from rasterio.enums import Resampling
@@ -60,6 +60,7 @@ def reproject(
     resampling: Resampling = ...,
     num_threads: int = 1,
     init_dest_nodata: bool = True,
+    tolerance: float = 0.125,
     warp_mem_limit: int = 0,
     src_geoloc_array: NDArray[Any] | None = None,
     **kwargs: _GDALOption,

stubs/rasterio/rasterio/windows.pyi

@@ -2,8 +2,8 @@ from collections.abc import Callable, Sequence
 from typing import Any, TypeAlias, overload
 from typing_extensions import Self, deprecated
 
+from affine import Affine as Affine
 from numpy.typing import NDArray
-from rasterio._affine_types import Affine
 from rasterio.errors import RasterioDeprecationWarning as RasterioDeprecationWarning, WindowError as WindowError
 
 _Bounds: TypeAlias = tuple[float, float, float, float]