Skip to content

Commit

Permalink
deps(flowio): v1.1
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
zbjornson committed Jul 19, 2024
1 parent a882721 commit 8935b26
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 3 additions & 1 deletion cellengine/resources/fcs_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def create_from_dataframe(
experiment_id: str,
filename: str,
df: DataFrame,
reagents: Optional[List[str]] = None,
reagents: Optional[List[Union[str, None]]] = None,
headers: Dict[str, str] = {},
) -> FcsFile:
"""Creates an FCS file from a DataFrame and uploads it CellEngine.
Expand Down Expand Up @@ -361,6 +361,8 @@ def create_from_dataframe(
channels = df.columns.get_level_values(0).tolist()
if reagents is None:
reagents = df.columns.get_level_values(1).tolist()
# Filter out nan values. An Index will cast None to float (nan).
reagents = [r if r == r else None for r in reagents]
else:
channels = df.columns

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
],
platforms="Posix; MacOS X; Windows",
install_requires=[
"flowio~=1.0",
"flowio @ git+https://github.com/cellengine/FlowIO.git@next",
"flowio~=1.1",
"numpy~=1.17",
"pandas~=1.1",
"requests~=2.22",
Expand Down

0 comments on commit 8935b26

Please sign in to comment.