Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions autotest/test_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def unstructured_grid(example_data_path):
)


@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "geopandas", name_map={"pyshp": "shapefile"})
@pytest.mark.parametrize("pathlike", (True, False))
def test_output_helper_shapefile_export(pathlike, function_tmpdir, example_data_path):
ml = Modflow.load(
Expand All @@ -179,7 +179,7 @@ def test_output_helper_shapefile_export(pathlike, function_tmpdir, example_data_
)


@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "geopandas", name_map={"pyshp": "shapefile"})
@pytest.mark.slow
def test_freyberg_export(function_tmpdir, example_data_path):
# steady state
Expand Down Expand Up @@ -323,7 +323,7 @@ def test_write_gridlines_shapefile(function_tmpdir):
assert len(sf) == 22


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

Expand Down Expand Up @@ -442,7 +442,7 @@ def test_netcdf_classmethods(function_tmpdir, example_data_path):
new_f.nc.close()


@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "geopandas", name_map={"pyshp": "shapefile"})
def test_shapefile_ibound(function_tmpdir, example_data_path):
from shapefile import Reader

Expand All @@ -465,7 +465,7 @@ def test_shapefile_ibound(function_tmpdir, example_data_path):
shape.close()


@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "geopandas", name_map={"pyshp": "shapefile"})
@pytest.mark.slow
@pytest.mark.parametrize("namfile", namfiles())
def test_shapefile(function_tmpdir, namfile):
Expand Down Expand Up @@ -555,7 +555,7 @@ def test_export_netcdf(function_tmpdir, namfile):
nc.close()


@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "geopandas", name_map={"pyshp": "shapefile"})
def test_export_array2(function_tmpdir):
nrow = 7
ncol = 11
Expand Down Expand Up @@ -586,7 +586,7 @@ def test_export_array2(function_tmpdir):


@pytest.mark.mf6
@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "geopandas", name_map={"pyshp": "shapefile"})
def test_array3d_export_structured(function_tmpdir):
from shapefile import Reader

Expand Down Expand Up @@ -2127,7 +2127,7 @@ def test_to_shapefile_raises_attributeerror():


@pytest.mark.mf6
@requires_pkg("pyshp", name_map={"pyshp": "shapefile"})
@requires_pkg("pyshp", "geopandas", name_map={"pyshp": "shapefile"})
@pytest.mark.parametrize("use_pandas", [True]) # TODO: test non-pandas
@pytest.mark.parametrize("sparse", [True, False])
def test_mf6_chd_shapefile_export_structured(function_tmpdir, use_pandas, sparse):
Expand Down
2 changes: 1 addition & 1 deletion autotest/test_model_splitter.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def test_metis_splitting_with_lak_sfr(function_tmpdir):
@requires_exe("mf6")
@requires_pkg("pymetis")
@requires_pkg("h5py")
# @requires_pkg("sklearn")
@requires_pkg("sklearn")
def test_save_load_node_mapping_structured(function_tmpdir):
import pymetis

Expand Down
Loading