Skip to content

Commit 8935b26

Browse files
committed
deps(flowio): v1.1
Moves from our fork to v1.1. Our fork ignored nan reagent values when writing files, but we should instead filter them out before calling flowio.
1 parent a882721 commit 8935b26

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

cellengine/resources/fcs_file.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def create_from_dataframe(
262262
experiment_id: str,
263263
filename: str,
264264
df: DataFrame,
265-
reagents: Optional[List[str]] = None,
265+
reagents: Optional[List[Union[str, None]]] = None,
266266
headers: Dict[str, str] = {},
267267
) -> FcsFile:
268268
"""Creates an FCS file from a DataFrame and uploads it CellEngine.
@@ -361,6 +361,8 @@ def create_from_dataframe(
361361
channels = df.columns.get_level_values(0).tolist()
362362
if reagents is None:
363363
reagents = df.columns.get_level_values(1).tolist()
364+
# Filter out nan values. An Index will cast None to float (nan).
365+
reagents = [r if r == r else None for r in reagents]
364366
else:
365367
channels = df.columns
366368

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
],
4141
platforms="Posix; MacOS X; Windows",
4242
install_requires=[
43-
"flowio~=1.0",
44-
"flowio @ git+https://github.com/cellengine/FlowIO.git@next",
43+
"flowio~=1.1",
4544
"numpy~=1.17",
4645
"pandas~=1.1",
4746
"requests~=2.22",

0 commit comments

Comments
 (0)