Skip to content

tests(t004): fix small issue that only occurs on Windows #695

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
christianlangevin merged 1 commit into from
Oct 24, 2019
Merged

tests(t004): fix small issue that only occurs on Windows #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions autotest/t004_test_utilarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,10 @@ def test_mflist():
fluxcol = 'flux{}'.format(per)
dfper = df.dropna(subset=[fluxcol], axis=0).copy()
dfper.rename(columns={fluxcol: 'flux'}, inplace=True)
assert np.array_equal(dfper[['k', 'i', 'j', 'flux']].to_records(index=False), data)
dfdata = dfper[['k', 'i', 'j', 'flux']].to_records(index=False)
dfdata = dfdata.astype(data.dtype)
errmsg = 'data not equal:\n {}\n {}'.format(dfdata, data)
assert np.array_equal(dfdata, data), errmsg

m4ds = ml.wel.stress_period_data.masked_4D_arrays
sp_data = flopy.utils.MfList.masked4D_arrays_to_stress_period_data \
Expand Down Expand Up @@ -792,7 +795,7 @@ def test_util3d_reset():
# test_util2d_external_fixed_nomodelws()
# test_util2d_external_fixed_path_nomodelws()
# test_transient2d()
#test_transient3d()
# test_transient3d()
# test_util2d()
# test_util3d()
# test_how()
Binary file modified examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.dbf
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shp
View file
Open in desktop
Binary file not shown.
Binary file modified examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shx
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion flopy/utils/util_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ def get_dataframe(self, squeeze=True):
dfi = dfi.set_index(names)
else:
dfi = pd.DataFrame.from_records(recs)
# dfi = dfi.set_index(names)
dfg = dfi.groupby(names)
count = dfg[varnames[0]].count().rename('n')
if (count > 1).values.any():
Expand Down