Skip to content

Commit 2b7825d

Browse files
hamdanalhamdanal
authored
Update dependencies (#32)
1 parent a0f7a70 commit 2b7825d

File tree

12 files changed

+1272
-942
lines changed

12 files changed

+1272
-942
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v5.0.0
3+
rev: v6.0.0
44
hooks:
55
- id: trailing-whitespace
66
- id: end-of-file-fixer
@@ -10,7 +10,7 @@ repos:
1010
- id: mixed-line-ending
1111
- id: check-case-conflict
1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.12.1 # must match uv.lock
13+
rev: v0.13.0 # must match uv.lock
1414
hooks:
1515
- id: ruff-check
1616
- id: ruff-format

‎pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ strict = true
8383
warn_unused_ignores = true
8484
disallow_untyped_defs = false
8585
disallow_incomplete_defs = false
86+
enable_error_code = "deprecated"
8687

8788
[tool.pyright]
8889
# Project settings

‎tests/geopandas/test_io.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ def test_read_file(tmp_path: Path) -> None:
4040
def test_infer_schema() -> None:
4141
schema = infer_schema(GDF)
4242
heterogeneous_schema = infer_schema(gpd.GeoDataFrame({"x": [1, 2], "geometry": [P, LS]}))
43-
check(assert_type(schema, _Schema), _Schema, dtype=str)
43+
check(
44+
assert_type(schema, _Schema),
45+
_Schema, # pyright: ignore[reportGeneralTypeIssues]
46+
dtype=str,
47+
)
4448
check(assert_type(schema["geometry"], str | list[str]), str)
4549
check(assert_type(heterogeneous_schema["geometry"], str | list[str]), list, dtype=str)
4650
check(assert_type(schema["properties"], OrderedDict[str, str]), OrderedDict, dtype=str)

‎tests/shapely/test_coordinates.py‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,42 +16,31 @@
1616

1717

1818
def test_transform() -> None:
19-
# TODO: remove astype(np.float64) when https://github.com/numpy/numpy/issues/28071 is fixed
2019
check(assert_type(shapely.transform(P, lambda x: x), Point), Point)
21-
check(assert_type(shapely.transform(P, lambda x: (x + 1.0).astype(np.float64)), Point), Point)
20+
check(assert_type(shapely.transform(P, lambda x: x + 1.0), Point), Point)
2221
check(assert_type(shapely.transform(None, lambda x: x), None), NoneType)
2322
check(
24-
assert_type(
25-
shapely.transform(shapely.from_wkt(P.wkt), lambda x: (x + 1.0).astype(np.float64)),
26-
BaseGeometry,
27-
),
23+
assert_type(shapely.transform(shapely.from_wkt(P.wkt), lambda x: x + 1.0), BaseGeometry),
2824
Point,
2925
)
3026

3127
def transformer(coords: ArrayLike) -> NDArray[np.float64]:
32-
return (np.asarray(coords) + 1).astype(np.float64)
28+
return np.asarray(coords) + 1
3329

3430
check(assert_type(shapely.transform(P, transformer), Point), Point)
3531

3632
check(
37-
assert_type(
38-
shapely.transform([P], lambda x: (x + 1.0).astype(np.float64)), NDArray[np.object_]
39-
),
33+
assert_type(shapely.transform([P], lambda x: x + 1.0), NDArray[np.object_]),
4034
np.ndarray,
4135
dtype=Point,
4236
)
4337
check(
44-
assert_type(
45-
shapely.transform([None], lambda x: (x + 1.0).astype(np.float64)), NDArray[np.object_]
46-
),
38+
assert_type(shapely.transform([None], lambda x: x + 1.0), NDArray[np.object_]),
4739
np.ndarray,
4840
dtype=NoneType,
4941
)
5042
check(
51-
assert_type(
52-
shapely.transform((P, None), lambda x: (x + 1.0).astype(np.float64)),
53-
NDArray[np.object_],
54-
),
43+
assert_type(shapely.transform((P, None), lambda x: x + 1.0), NDArray[np.object_]),
5544
np.ndarray,
5645
dtype=Point,
5746
)
@@ -88,7 +77,7 @@ def test_get_coordinates() -> None:
8877
)
8978
coords, idx = with_index
9079
check(coords, np.ndarray, dtype=float)
91-
check(idx, np.ndarray, dtype=np.integer)
80+
check(idx, np.ndarray, dtype=np.int64)
9281
check(
9382
assert_type(
9483
shapely.get_coordinates([P, None], return_index=True),

‎tests/shapely/test_geometry.py‎

Lines changed: 56 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -483,71 +483,69 @@ def __geo_interface__(self) -> dict[str, object]:
483483

484484
def test_generic_getset() -> None:
485485
# type_id
486-
check(assert_type(shapely.get_type_id(P), int), np.integer)
487-
check(assert_type(shapely.get_type_id(None), int), np.integer)
488-
check(assert_type(shapely.get_type_id([P]), NDArray[np.int64]), np.ndarray, dtype=np.integer)
489-
check(assert_type(shapely.get_type_id([None]), NDArray[np.int64]), np.ndarray, dtype=np.integer)
486+
check(assert_type(shapely.get_type_id(P), np.int32), np.int32)
487+
check(assert_type(shapely.get_type_id(None), np.int32), np.int32)
488+
check(assert_type(shapely.get_type_id([P]), NDArray[np.int64]), np.ndarray, dtype=np.int32)
489+
check(assert_type(shapely.get_type_id([None]), NDArray[np.int64]), np.ndarray, dtype=np.int32)
490490
check(
491-
assert_type(shapely.get_type_id((P, None)), NDArray[np.int64]), np.ndarray, dtype=np.integer
491+
assert_type(shapely.get_type_id((P, None)), NDArray[np.int64]), np.ndarray, dtype=np.int32
492492
)
493493

494494
# dimensions
495-
check(assert_type(shapely.get_dimensions(P), int), np.integer)
496-
check(assert_type(shapely.get_dimensions(None), int), np.integer)
497-
check(assert_type(shapely.get_dimensions([P]), NDArray[np.int64]), np.ndarray, dtype=np.integer)
495+
check(assert_type(shapely.get_dimensions(P), np.int32), np.int32)
496+
check(assert_type(shapely.get_dimensions(None), np.int32), np.int32)
497+
check(assert_type(shapely.get_dimensions([P]), NDArray[np.int64]), np.ndarray, dtype=np.int32)
498498
check(
499-
assert_type(shapely.get_dimensions([None]), NDArray[np.int64]), np.ndarray, dtype=np.integer
499+
assert_type(shapely.get_dimensions([None]), NDArray[np.int64]), np.ndarray, dtype=np.int32
500500
)
501501
check(
502502
assert_type(shapely.get_dimensions((P, None)), NDArray[np.int64]),
503503
np.ndarray,
504-
dtype=np.integer,
504+
dtype=np.int32,
505505
)
506506

507507
# coordinate_dimension
508-
check(assert_type(shapely.get_coordinate_dimension(P), int), np.integer)
509-
check(assert_type(shapely.get_coordinate_dimension(None), int), np.integer)
508+
check(assert_type(shapely.get_coordinate_dimension(P), np.int32), np.int32)
509+
check(assert_type(shapely.get_coordinate_dimension(None), np.int32), np.int32)
510510
check(
511511
assert_type(shapely.get_coordinate_dimension([P]), NDArray[np.int64]),
512512
np.ndarray,
513-
dtype=np.integer,
513+
dtype=np.int32,
514514
)
515515
check(
516516
assert_type(shapely.get_coordinate_dimension([None]), NDArray[np.int64]),
517517
np.ndarray,
518-
dtype=np.integer,
518+
dtype=np.int32,
519519
)
520520
check(
521521
assert_type(shapely.get_coordinate_dimension((P, None)), NDArray[np.int64]),
522522
np.ndarray,
523-
dtype=np.integer,
523+
dtype=np.int32,
524524
)
525525

526526
# num_coordinates
527-
check(assert_type(shapely.get_num_coordinates(P), int), np.integer)
528-
check(assert_type(shapely.get_num_coordinates(None), int), np.integer)
527+
check(assert_type(shapely.get_num_coordinates(P), np.int32), np.int32)
528+
check(assert_type(shapely.get_num_coordinates(None), np.int32), np.int32)
529529
check(
530-
assert_type(shapely.get_num_coordinates([P]), NDArray[np.int64]),
531-
np.ndarray,
532-
dtype=np.integer,
530+
assert_type(shapely.get_num_coordinates([P]), NDArray[np.int64]), np.ndarray, dtype=np.int32
533531
)
534532
check(
535533
assert_type(shapely.get_num_coordinates([None]), NDArray[np.int64]),
536534
np.ndarray,
537-
dtype=np.integer,
535+
dtype=np.int32,
538536
)
539537
check(
540538
assert_type(shapely.get_num_coordinates((P, None)), NDArray[np.int64]),
541539
np.ndarray,
542-
dtype=np.integer,
540+
dtype=np.int32,
543541
)
544542

545543
# srid
546-
check(assert_type(shapely.get_srid(P), int), np.integer)
547-
check(assert_type(shapely.get_srid(None), int), np.integer)
548-
check(assert_type(shapely.get_srid([P]), NDArray[np.int64]), np.ndarray, dtype=np.integer)
549-
check(assert_type(shapely.get_srid([None]), NDArray[np.int64]), np.ndarray, dtype=np.integer)
550-
check(assert_type(shapely.get_srid((P, None)), NDArray[np.int64]), np.ndarray, dtype=np.integer)
544+
check(assert_type(shapely.get_srid(P), np.int32), np.int32)
545+
check(assert_type(shapely.get_srid(None), np.int32), np.int32)
546+
check(assert_type(shapely.get_srid([P]), NDArray[np.int64]), np.ndarray, dtype=np.int32)
547+
check(assert_type(shapely.get_srid([None]), NDArray[np.int64]), np.ndarray, dtype=np.int32)
548+
check(assert_type(shapely.get_srid((P, None)), NDArray[np.int64]), np.ndarray, dtype=np.int32)
551549

552550
check(assert_type(shapely.set_srid(P, 20), Point), Point)
553551
check(assert_type(shapely.set_srid(None, 20), None), NoneType)
@@ -560,8 +558,8 @@ def test_generic_getset() -> None:
560558
)
561559

562560
# precision
563-
check(assert_type(shapely.get_precision(None), float), float)
564-
check(assert_type(shapely.get_precision(P), float), float)
561+
check(assert_type(shapely.get_precision(None), np.float64), np.float64)
562+
check(assert_type(shapely.get_precision(P), np.float64), np.float64)
565563
check(assert_type(shapely.get_precision([P]), NDArray[np.float64]), np.ndarray, dtype=float)
566564
check(assert_type(shapely.get_precision([None]), NDArray[np.float64]), np.ndarray, dtype=float)
567565
check(
@@ -615,23 +613,23 @@ def test_generic_getset() -> None:
615613

616614

617615
def test_point_getset() -> None:
618-
check(assert_type(shapely.get_x(P), float), float)
619-
check(assert_type(shapely.get_x(LS), float), float)
620-
check(assert_type(shapely.get_x(None), float), float)
616+
check(assert_type(shapely.get_x(P), np.float64), np.float64)
617+
check(assert_type(shapely.get_x(LS), np.float64), np.float64)
618+
check(assert_type(shapely.get_x(None), np.float64), np.float64)
621619
check(assert_type(shapely.get_x([P]), NDArray[np.float64]), np.ndarray, dtype=float)
622620
check(assert_type(shapely.get_x([None]), NDArray[np.float64]), np.ndarray, dtype=float)
623621
check(assert_type(shapely.get_x((P, None)), NDArray[np.float64]), np.ndarray, dtype=float)
624622

625-
check(assert_type(shapely.get_y(P), float), float)
626-
check(assert_type(shapely.get_y(LS), float), float)
627-
check(assert_type(shapely.get_y(None), float), float)
623+
check(assert_type(shapely.get_y(P), np.float64), np.float64)
624+
check(assert_type(shapely.get_y(LS), np.float64), np.float64)
625+
check(assert_type(shapely.get_y(None), np.float64), np.float64)
628626
check(assert_type(shapely.get_y([P]), NDArray[np.float64]), np.ndarray, dtype=float)
629627
check(assert_type(shapely.get_y([None]), NDArray[np.float64]), np.ndarray, dtype=float)
630628
check(assert_type(shapely.get_y((P, None)), NDArray[np.float64]), np.ndarray, dtype=float)
631629

632-
check(assert_type(shapely.get_z(P), float), float)
633-
check(assert_type(shapely.get_z(LS), float), float)
634-
check(assert_type(shapely.get_z(None), float), float)
630+
check(assert_type(shapely.get_z(P), np.float64), np.float64)
631+
check(assert_type(shapely.get_z(LS), np.float64), np.float64)
632+
check(assert_type(shapely.get_z(None), np.float64), np.float64)
635633
check(assert_type(shapely.get_z([P]), NDArray[np.float64]), np.ndarray, dtype=float)
636634
check(assert_type(shapely.get_z([None]), NDArray[np.float64]), np.ndarray, dtype=float)
637635
check(assert_type(shapely.get_z((P, None)), NDArray[np.float64]), np.ndarray, dtype=float)
@@ -658,17 +656,17 @@ def test_linestring_getset() -> None:
658656
check(assert_type(shapely.get_point(LS, [0]), NDArray[np.object_]), np.ndarray, dtype=Point)
659657
check(assert_type(shapely.get_point([LS], [0]), NDArray[np.object_]), np.ndarray, dtype=Point)
660658

661-
check(assert_type(shapely.get_num_points(LS), int), np.integer)
662-
check(assert_type(shapely.get_num_points(P), int), np.integer)
663-
check(assert_type(shapely.get_num_points(None), int), np.integer)
664-
check(assert_type(shapely.get_num_points([P]), NDArray[np.int64]), np.ndarray, dtype=np.integer)
659+
check(assert_type(shapely.get_num_points(LS), np.int32), np.int32)
660+
check(assert_type(shapely.get_num_points(P), np.int32), np.int32)
661+
check(assert_type(shapely.get_num_points(None), np.int32), np.int32)
662+
check(assert_type(shapely.get_num_points([P]), NDArray[np.int64]), np.ndarray, dtype=np.int32)
665663
check(
666-
assert_type(shapely.get_num_points([None]), NDArray[np.int64]), np.ndarray, dtype=np.integer
664+
assert_type(shapely.get_num_points([None]), NDArray[np.int64]), np.ndarray, dtype=np.int32
667665
)
668666
check(
669667
assert_type(shapely.get_num_points((P, None)), NDArray[np.int64]),
670668
np.ndarray,
671-
dtype=np.integer,
669+
dtype=np.int32,
672670
)
673671

674672

@@ -735,23 +733,23 @@ def test_polygon_getset() -> None:
735733
dtype=LinearRing,
736734
)
737735

738-
check(assert_type(shapely.get_num_interior_rings(PO), int), np.integer)
739-
check(assert_type(shapely.get_num_interior_rings(P), int), np.integer)
740-
check(assert_type(shapely.get_num_interior_rings(None), int), np.integer)
736+
check(assert_type(shapely.get_num_interior_rings(PO), np.int32), np.int32)
737+
check(assert_type(shapely.get_num_interior_rings(P), np.int32), np.int32)
738+
check(assert_type(shapely.get_num_interior_rings(None), np.int32), np.int32)
741739
check(
742740
assert_type(shapely.get_num_interior_rings([P]), NDArray[np.int64]),
743741
np.ndarray,
744-
dtype=np.integer,
742+
dtype=np.int32,
745743
)
746744
check(
747745
assert_type(shapely.get_num_interior_rings([None]), NDArray[np.int64]),
748746
np.ndarray,
749-
dtype=np.integer,
747+
dtype=np.int32,
750748
)
751749
check(
752750
assert_type(shapely.get_num_interior_rings((P, None)), NDArray[np.int64]),
753751
np.ndarray,
754-
dtype=np.integer,
752+
dtype=np.int32,
755753
)
756754

757755

@@ -787,23 +785,21 @@ def test_collection_getset() -> None:
787785
assert_type(shapely.get_geometry([MP], [0]), NDArray[np.object_]), np.ndarray, dtype=Point
788786
)
789787

790-
check(assert_type(shapely.get_num_geometries(MP), int), np.integer)
791-
check(assert_type(shapely.get_num_geometries(P), int), np.integer)
792-
check(assert_type(shapely.get_num_geometries(None), int), np.integer)
788+
check(assert_type(shapely.get_num_geometries(MP), np.int32), np.int32)
789+
check(assert_type(shapely.get_num_geometries(P), np.int32), np.int32)
790+
check(assert_type(shapely.get_num_geometries(None), np.int32), np.int32)
793791
check(
794-
assert_type(shapely.get_num_geometries([P]), NDArray[np.int64]),
795-
np.ndarray,
796-
dtype=np.integer,
792+
assert_type(shapely.get_num_geometries([P]), NDArray[np.int64]), np.ndarray, dtype=np.int32
797793
)
798794
check(
799795
assert_type(shapely.get_num_geometries([None]), NDArray[np.int64]),
800796
np.ndarray,
801-
dtype=np.integer,
797+
dtype=np.int32,
802798
)
803799
check(
804800
assert_type(shapely.get_num_geometries((P, None)), NDArray[np.int64]),
805801
np.ndarray,
806-
dtype=np.integer,
802+
dtype=np.int32,
807803
)
808804

809805
check(assert_type(shapely.get_parts(P), NDArray[np.object_]), np.ndarray, dtype=Point)
@@ -825,7 +821,7 @@ def test_collection_getset() -> None:
825821
dtype=np.ndarray,
826822
)
827823
check(assert_type(parts_with_index[0], NDArray[np.object_]), np.ndarray, dtype=BaseGeometry)
828-
check(assert_type(parts_with_index[1], NDArray[np.int64]), np.ndarray, dtype=np.integer)
824+
check(assert_type(parts_with_index[1], NDArray[np.int64]), np.ndarray, dtype=np.int64)
829825
check(
830826
assert_type(
831827
shapely.get_parts(None, return_index=True),
@@ -871,7 +867,7 @@ def test_collection_getset() -> None:
871867
dtype=np.ndarray,
872868
)
873869
check(assert_type(parts_with_index[0], NDArray[np.object_]), np.ndarray, dtype=LinearRing)
874-
check(assert_type(parts_with_index[1], NDArray[np.int64]), np.ndarray, dtype=np.integer)
870+
check(assert_type(parts_with_index[1], NDArray[np.int64]), np.ndarray, dtype=np.int64)
875871
check(
876872
assert_type(
877873
shapely.get_rings(None, return_index=True),

‎tests/shapely/test_io.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def test_ragged_array() -> None:
102102
check(assert_type(ra[0], GeometryType), GeometryType)
103103
check(assert_type(ra[1], NDArray[np.float64]), np.ndarray, dtype=float)
104104
check(assert_type(ra[2], tuple[NDArray[np.int64], ...]), tuple, dtype=np.ndarray)
105-
check(assert_type(ra[2][0], NDArray[np.int64]), np.ndarray, dtype=np.integer)
105+
check(assert_type(ra[2][0], NDArray[np.int64]), np.ndarray, dtype=np.int32)
106106
check(
107107
assert_type(
108108
shapely.to_ragged_array([PO], include_z=True),

‎tests/shapely/test_linear.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,14 @@ def test_line_interpolate_point() -> None:
5353

5454

5555
def test_line_locate_point() -> None:
56-
check(assert_type(shapely.line_locate_point(LS, P), float), float)
57-
check(assert_type(shapely.line_locate_point(MLS, P), float), float)
58-
check(assert_type(shapely.line_locate_point(GeometryCollection(MLS), P), float), float)
59-
check(assert_type(shapely.line_locate_point(None, P), float), float)
60-
check(assert_type(shapely.line_locate_point(LS, None), float), float)
61-
check(assert_type(shapely.line_locate_point(None, None), float), float)
56+
check(assert_type(shapely.line_locate_point(LS, P), np.float64), np.float64)
57+
check(assert_type(shapely.line_locate_point(MLS, P), np.float64), np.float64)
58+
check(
59+
assert_type(shapely.line_locate_point(GeometryCollection(MLS), P), np.float64), np.float64
60+
)
61+
check(assert_type(shapely.line_locate_point(None, P), np.float64), np.float64)
62+
check(assert_type(shapely.line_locate_point(LS, None), np.float64), np.float64)
63+
check(assert_type(shapely.line_locate_point(None, None), np.float64), np.float64)
6264
check(
6365
assert_type(shapely.line_locate_point([MLS, LS], P), NDArray[np.float64]),
6466
np.ndarray,
@@ -74,7 +76,7 @@ def test_line_locate_point() -> None:
7476
np.ndarray,
7577
dtype=float,
7678
)
77-
check(assert_type(shapely.line_locate_point(LS, P, normalized=True), float), float)
79+
check(assert_type(shapely.line_locate_point(LS, P, normalized=True), np.float64), np.float64)
7880
check(
7981
assert_type(shapely.line_locate_point([MLS, LS], P, normalized=True), NDArray[np.float64]),
8082
np.ndarray,

0 commit comments

Comments
 (0)