Skip to content

Commit b7d59a1

Browse files
authored
fix(ci): remove environment hdf5 dependency (#2251)
Fix confusion between hdf5 installed from pixi environment h5py package and downloaded with NetCDF-C for the extended build.
1 parent c3ce73b commit b7d59a1

File tree

5 files changed

+3
-306
lines changed

5 files changed

+3
-306
lines changed

autotest/test_gwf_newton_under_relaxation.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
chd_spd = [[0, i, 0, H1] for i in range(nrow)]
3333
chd_spd += [[0, i, ncol - 1, H2] for i in range(nrow)]
3434
base_heads = flopy.utils.HeadFile(data_path / "results.hds.cmp").get_data()
35+
mfsplit = None
3536

3637

3738
def build_models(idx, test):
@@ -92,12 +93,12 @@ def build_models(idx, test):
9293
)
9394

9495
if idx == 1:
96+
global mfsplit
9597
sim.write_simulation(silent=True)
9698
mfsplit = flopy.mf6.utils.Mf6Splitter(sim)
9799
split_array = np.tri(nrow, ncol).astype(int)
98100
new_sim = mfsplit.split_model(split_array)
99101
new_sim.set_sim_path(test.workspace)
100-
mfsplit.save_node_mapping(pl.Path(f"{test.workspace}/mapping.h5"))
101102
return new_sim, None
102103
else:
103104
return sim, None
@@ -106,9 +107,6 @@ def build_models(idx, test):
106107
def check_output(idx, test):
107108
mf6sim = flopy.mf6.MFSimulation.load(sim_ws=test.workspace)
108109
if idx == 1:
109-
mfsplit = flopy.mf6.utils.Mf6Splitter.load_node_mapping(
110-
pl.Path(f"{test.workspace}/mapping.h5")
111-
)
112110
head_dict = {}
113111
for modelname in mf6sim.model_names:
114112
mnum = int(modelname.split("_")[-1])

autotest/test_par_gwf_pakcc.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
This test also checks that Newton under_relaxation works in parallel.
99
"""
1010

11-
import pathlib as pl
12-
1311
import flopy
1412
import numpy as np
1513
import pytest
@@ -30,7 +28,6 @@ def build_models(idx, test):
3028
split_array[5:] = 1
3129
new_sim = mfsplit.split_model(split_array)
3230
new_sim.set_sim_path(test.workspace)
33-
mfsplit.save_node_mapping(pl.Path(f"{test.workspace}/mapping.json"))
3431
return new_sim, None
3532
else:
3633
return sim, dummy

environment.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ dependencies:
1515
- fprettify
1616
- fortran-language-server
1717
- gitpython
18-
- h5py
1918
- Jinja2>=3.1.5,<4
2019
- jupytext
2120
- matplotlib
@@ -44,4 +43,4 @@ dependencies:
4443
- shapely
4544
- syrupy
4645
- tomli>=2.2.1,<3
47-
46+

0 commit comments

Comments
 (0)