Skip to content

test: add missing shapely requires_pkg markers #2810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wpbonelli merged 2 commits into from
Aug 13, 2026
+8 −6
Merged

test: add missing shapely requires_pkg markers #2810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba8ca99
test: add missing shapely requires_pkg markers
wpbonelli Aug 13, 2026
8e874bf
ruff
wpbonelli Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autotest/test_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def test_freyberg_export(function_tmpdir, example_data_path):
assert m.drn.stress_period_data.mg.angrot == m.modelgrid.angrot


@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "shapely", name_map={"pyshp": "shapefile"})
@pytest.mark.parametrize("missing_arrays", [True, False])
@pytest.mark.slow
def test_disu_export(function_tmpdir, missing_arrays):
Expand Down Expand Up @@ -623,7 +623,7 @@ def test_array3d_export_structured(function_tmpdir):
]


@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "shapely", name_map={"pyshp": "shapefile"})
def test_array3d_export_unstructured(function_tmpdir):
from shapefile import Reader

Expand Down
4 changes: 2 additions & 2 deletions autotest/test_gridgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def get_structured_grid():


@requires_exe("gridgen")
@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "shapely", name_map={"pyshp": "shapefile"})
@pytest.mark.parametrize("grid_type", ["vertex", "unstructured"])
def test_add_active_domain(function_tmpdir, grid_type):
bgrid = get_structured_grid()
Expand Down Expand Up @@ -95,7 +95,7 @@ def test_add_active_domain(function_tmpdir, grid_type):


@requires_exe("gridgen")
@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "shapely", name_map={"pyshp": "shapefile"})
@pytest.mark.parametrize("grid_type", ["vertex", "unstructured"])
def test_add_refinement_feature(function_tmpdir, grid_type):
bgrid = get_structured_grid()
Expand Down
2 changes: 1 addition & 1 deletion autotest/test_model_splitter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ def test_unstructured_complex_disu(function_tmpdir):


@requires_exe("mf6")
@requires_pkg("pymetis", "scipy")
@requires_pkg("pymetis", "scipy", "shapely")
def test_multi_model(function_tmpdir):
from scipy.spatial import KDTree

Expand Down
2 changes: 2 additions & 0 deletions autotest/test_modeltime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import numpy as np
import pandas as pd
import pytest
from modflow_devtools.markers import requires_pkg

import flopy
from flopy.discretization.modeltime import ModelTime
Expand Down Expand Up @@ -360,6 +361,7 @@ def test_from_headers_test005_advgw_tidal(example_data_path):
assert np.allclose(mt.tsmult, tdis.perioddata.get_data()["tsmult"])


@requires_pkg("pyshp", "shapely", name_map={"pyshp": "shapefile"})
def test_from_headers_disu(function_tmpdir):
from autotest.test_export import disu_sim as _disu_sim

Expand Down
2 changes: 1 addition & 1 deletion autotest/test_particledata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ def test_nodeparticledata_to_prp_dis_1_per_face():
assert len(rpts) == num_cells * 6


@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "shapely", name_map={"pyshp": "shapefile"})
def test_nodeparticledata_prp_disv_big(function_tmpdir):
Lx = 10000.0
Ly = 10500.0
Expand Down