Skip to content

Commit

Permalink
change version numbers to reflect release schedule
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbrakenhoff
dbrakenhoff committed Oct 23, 2024
1 parent e828306 commit 80cd08e
Showing 1 changed file with 34 additions and 34 deletions.
68 changes: 34 additions & 34 deletions autotest/test_gridintersect.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from flopy.utils.gridintersect import GridIntersect
from flopy.utils.triangle import Triangle

# TODO: remove all structured tests in v3.9.0, see TODO's in the tests
# TODO: remove all structured tests in v3.10.0, see TODO's in the tests

if has_pkg("shapely", strict=True):
from shapely.geometry import (
Expand Down Expand Up @@ -156,7 +156,7 @@ def test_rect_grid_3d_point_outside():

@requires_pkg("shapely")
def test_rect_grid_point_outside():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
# use GeoSpatialUtil to convert to shapely geometry
Expand All @@ -166,7 +166,7 @@ def test_rect_grid_point_outside():

@requires_pkg("shapely")
def test_rect_grid_point_on_outer_boundary():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(Point(20.0, 10.0))
Expand All @@ -176,7 +176,7 @@ def test_rect_grid_point_on_outer_boundary():

@requires_pkg("shapely")
def test_rect_grid_point_on_inner_boundary():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(Point(10.0, 10.0))
Expand All @@ -186,7 +186,7 @@ def test_rect_grid_point_on_inner_boundary():

@requires_pkg("shapely")
def test_rect_grid_multipoint_in_one_cell():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(MultiPoint([Point(1.0, 1.0), Point(2.0, 2.0)]))
Expand All @@ -196,7 +196,7 @@ def test_rect_grid_multipoint_in_one_cell():

@requires_pkg("shapely")
def test_rect_grid_multipoint_in_multiple_cells():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(MultiPoint([Point(1.0, 1.0), Point(12.0, 12.0)]))
Expand Down Expand Up @@ -341,7 +341,7 @@ def test_tri_grid_multipoint_in_multiple_cells(rtree):
@requires_pkg("shapely")
@rtree_toggle
def test_rect_grid_point_on_all_vertices_return_all_ix(rtree):
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured", rtree=rtree)
n_intersections = [1, 2, 1, 2, 4, 2, 1, 2, 1]
Expand Down Expand Up @@ -377,7 +377,7 @@ def test_tri_grid_points_on_all_vertices_return_all_ix_shapely(rtree):

@requires_pkg("shapely")
def test_rect_grid_linestring_outside():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(LineString([(25.0, 25.0), (21.0, 5.0)]))
Expand All @@ -386,7 +386,7 @@ def test_rect_grid_linestring_outside():

@requires_pkg("shapely")
def test_rect_grid_linestring_in_2cells():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(LineString([(5.0, 5.0), (15.0, 5.0)]))
Expand All @@ -398,7 +398,7 @@ def test_rect_grid_linestring_in_2cells():

@requires_pkg("shapely")
def test_rect_grid_linestring_on_outer_boundary():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(LineString([(15.0, 20.0), (5.0, 20.0)]))
Expand All @@ -410,7 +410,7 @@ def test_rect_grid_linestring_on_outer_boundary():

@requires_pkg("shapely")
def test_rect_grid_linestring_on_inner_boundary():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(LineString([(5.0, 10.0), (15.0, 10.0)]))
Expand All @@ -422,7 +422,7 @@ def test_rect_grid_linestring_on_inner_boundary():

@requires_pkg("shapely")
def test_rect_grid_multilinestring_in_one_cell():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(
Expand All @@ -440,7 +440,7 @@ def test_rect_grid_multilinestring_in_one_cell():

@requires_pkg("shapely")
def test_rect_grid_multilinestring_in_multiple_cells():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(
Expand All @@ -457,7 +457,7 @@ def test_rect_grid_multilinestring_in_multiple_cells():

@requires_pkg("shapely")
def test_rect_grid_linestring_in_and_out_of_cell():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(LineString([(5.0, 9), (15.0, 5.0), (5.0, 1.0)]))
Expand All @@ -469,7 +469,7 @@ def test_rect_grid_linestring_in_and_out_of_cell():

@requires_pkg("shapely")
def test_rect_grid_linestring_in_and_out_of_cell2():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(
Expand All @@ -480,7 +480,7 @@ def test_rect_grid_linestring_in_and_out_of_cell2():

@requires_pkg("shapely")
def test_rect_grid_linestrings_on_boundaries_return_all_ix():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
x, y = ix._rect_grid_to_geoms_cellids()[0][0].exterior.xy
Expand All @@ -493,7 +493,7 @@ def test_rect_grid_linestrings_on_boundaries_return_all_ix():

@requires_pkg("shapely")
def test_rect_grid_linestring_starting_on_vertex():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(LineString([(10.0, 10.0), (15.0, 5.0)]))
Expand Down Expand Up @@ -780,7 +780,7 @@ def test_tri_grid_linestring_cell_boundary_return_all_ix_shapely(rtree):

@requires_pkg("shapely")
def test_rect_grid_polygon_outside():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(Polygon([(21.0, 11.0), (23.0, 17.0), (25.0, 11.0)]))
Expand All @@ -789,7 +789,7 @@ def test_rect_grid_polygon_outside():

@requires_pkg("shapely")
def test_rect_grid_polygon_in_2cells():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(
Expand All @@ -801,7 +801,7 @@ def test_rect_grid_polygon_in_2cells():

@requires_pkg("shapely")
def test_rect_grid_polygon_on_outer_boundary():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(
Expand All @@ -812,7 +812,7 @@ def test_rect_grid_polygon_on_outer_boundary():

@requires_pkg("shapely")
def test_rect_grid_polygon_running_along_boundary():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(
Expand All @@ -831,7 +831,7 @@ def test_rect_grid_polygon_running_along_boundary():

@requires_pkg("shapely")
def test_rect_grid_polygon_on_inner_boundary():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
result = ix.intersect(
Expand All @@ -848,7 +848,7 @@ def test_rect_grid_polygon_on_inner_boundary():

@requires_pkg("shapely")
def test_rect_grid_polygon_multiple_polygons():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
p = Polygon(
[
Expand Down Expand Up @@ -876,7 +876,7 @@ def test_rect_grid_polygon_multiple_polygons():

@requires_pkg("shapely")
def test_rect_grid_multiple_disjoint_polygons_on_inner_boundaries():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
p1 = Polygon([(5.0, 10.0), (15.0, 10.0), (15.0, 5.0), (5.0, 5.0)])
Expand All @@ -895,7 +895,7 @@ def test_rect_grid_multiple_disjoint_polygons_on_inner_boundaries():
@requires_pkg("shapely")
@pytest.mark.parametrize("transform", [True, False])
def test_rect_grid_polygon_reintersects_cell(transform):
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
if transform:
gr.set_coord_info(xoff=1, yoff=1, angrot=10.5)
Expand Down Expand Up @@ -930,7 +930,7 @@ def test_rect_grid_polygon_reintersects_cell(transform):

@requires_pkg("shapely")
def test_rect_grid_multipolygon_in_one_cell():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
p1 = Polygon([(1.0, 1.0), (8.0, 1.0), (8.0, 3.0), (1.0, 3.0)])
Expand All @@ -943,7 +943,7 @@ def test_rect_grid_multipolygon_in_one_cell():

@requires_pkg("shapely")
def test_rect_grid_multipolygon_in_multiple_cells():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
p1 = Polygon([(1.0, 1.0), (19.0, 1.0), (19.0, 3.0), (1.0, 3.0)])
Expand All @@ -956,7 +956,7 @@ def test_rect_grid_multipolygon_in_multiple_cells():

@requires_pkg("shapely")
def test_rect_grid_polygon_with_hole():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, method="structured")
p = Polygon(
Expand All @@ -971,7 +971,7 @@ def test_rect_grid_polygon_with_hole():
@requires_pkg("shapely")
@rtree_toggle
def test_rect_grid_polygon_contains_centroid(rtree):
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, rtree=rtree)
p = Polygon(
Expand All @@ -985,7 +985,7 @@ def test_rect_grid_polygon_contains_centroid(rtree):
@requires_pkg("shapely")
@rtree_toggle
def test_rect_grid_polygon_min_area(rtree):
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr, rtree=rtree)
p = Polygon(
Expand All @@ -998,7 +998,7 @@ def test_rect_grid_polygon_min_area(rtree):

@requires_pkg("shapely")
def test_rect_grid_polygon_centroid_and_min_area():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
gr = get_rect_grid()
ix = GridIntersect(gr)
p = Polygon(
Expand Down Expand Up @@ -1267,7 +1267,7 @@ def test_tri_grid_polygon_contains_centroid(rtree):

@requires_pkg("shapely")
def test_point_offset_rot_structured_grid():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
sgr = get_rect_grid(angrot=45.0, xyoffset=10.0)
p = Point(10.0, 10 + np.sqrt(200.0))
ix = GridIntersect(sgr, method="structured")
Expand All @@ -1281,7 +1281,7 @@ def test_point_offset_rot_structured_grid():

@requires_pkg("shapely")
def test_linestring_offset_rot_structured_grid():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
sgr = get_rect_grid(angrot=45.0, xyoffset=10.0)
ls = LineString([(5, 25), (15, 25)])
ix = GridIntersect(sgr, method="structured")
Expand All @@ -1295,7 +1295,7 @@ def test_linestring_offset_rot_structured_grid():

@requires_pkg("shapely")
def test_polygon_offset_rot_structured_grid():
# TODO: remove in 3.9.0
# TODO: remove in 3.10.0
sgr = get_rect_grid(angrot=45.0, xyoffset=10.0)
p = Polygon(
[
Expand Down

0 comments on commit 80cd08e

Please sign in to comment.