Merge pull request #263 from chillerb/master

add channel_labels check for creating Sample from ndarray

Author: whitews

src/flowkit/_models/sample.py

@@ -183,6 +183,9 @@ def __init__(
             if sample_id is None:
                 raise ValueError("'sample_id' is required for a NumPy array")
 
+            if channel_labels is None:
+                raise ValueError("'channel_labels' is required for a NumPy array")
+
             tmp_file = TemporaryFile()
             flowio.create_fcs(
                 tmp_file,

tests/sample_tests.py

@@ -126,6 +126,14 @@ def test_load_numpy_array_no_id_raises(self):
 
         self.assertRaises(ValueError, Sample, npy_data, channel_labels=channels)
 
+    def test_load_numpy_array_no_labels_raises(self):
+        npy_file_path = "data/test_comp_example.npy"
+        # noinspection SpellCheckingInspection
+
+        npy_data = np.fromfile(npy_file_path)
+
+        self.assertRaises(ValueError, Sample, npy_data, sample_id="my_sample")
+
     def test_load_dataframe_no_id_raises(self):
         npy_file_path = "data/test_comp_example.npy"
         # noinspection SpellCheckingInspection