Skip to content

Commit 34dd1d5

Browse files
authored
Pacwave Notebook fixes & Tidal Test fixes (#5)
* fix cdip * D3D TRTS eg fix * fix pylint error * pylint * fix too many branches * fix map and Tp * folium fix & Tp using pandas * up to python 3.10 * py version as string * fix variable check for new xarray * undo changes
1 parent 63f502a commit 34dd1d5

File tree

2 files changed

+106
-102
lines changed

2 files changed

+106
-102
lines changed

examples/PacWave_resource_characterization_example.ipynb

Lines changed: 94 additions & 100 deletions
Large diffs are not rendered by default.

mhkit/tests/tidal/test_io.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ def test_load_noaa_data_xarray(self):
5959
"""
6060
file_name = join(datadir, "s08010.json")
6161
data = tidal.io.noaa.read_noaa_json(file_name, to_pandas=False)
62-
self.assertTrue(np.all(list(data.variables) == ["index", "s", "d", "b"]))
62+
# Check if the variable sets are equal
63+
data_variables = list(data.variables)
64+
required_variables = ["index", "s", "d", "b"]
65+
data_variables_set = set(data_variables)
66+
required_variables_set = set(required_variables)
67+
self.assertTrue(data_variables_set == required_variables_set)
6368
self.assertEqual(len(data["index"]), 18890)
6469
self.assertEqual(data.attrs["id"], "s08010")
6570

@@ -96,7 +101,12 @@ def test_request_noaa_data_basic_xarray(self):
96101
write_json=None,
97102
to_pandas=False,
98103
)
99-
self.assertTrue(np.all(list(data.variables) == ["index", "s", "d", "b"]))
104+
# Check if the variable sets are equal
105+
data_variables = list(data.variables)
106+
required_variables = ["index", "s", "d", "b"]
107+
data_variables_set = set(data_variables)
108+
required_variables_set = set(required_variables)
109+
self.assertTrue(data_variables_set == required_variables_set)
100110
self.assertEqual(len(data["index"]), 183)
101111
self.assertEqual(data.attrs["id"], "s08010")
102112

0 commit comments

Comments
 (0)