Skip to content

Commit e19f200

Browse files
committed
Merge branch 'develop'
2 parents d9f419c + 3880a63 commit e19f200

39 files changed

+2251
-235
lines changed

.github/workflows/test_base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
test:
88
strategy:
99
matrix:
10-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
10+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1111

1212
runs-on: ubuntu-latest
1313

.github/workflows/test_flowkit_develop.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,52 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
python-version: ["3.10"]
14+
python-version: ["3.12"]
1515

1616
steps:
1717
- name: Setup Python
1818
uses: actions/setup-python@v5
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121

22+
- name: Upgrade pip
23+
run:
24+
pip install --upgrade pip
25+
2226
- name: Checkout FlowIO
2327
uses: actions/checkout@v4
2428
with:
2529
ref: develop
2630
path: flowio
2731

32+
- name: Checkout FlowUtils
33+
uses: actions/checkout@v4
34+
with:
35+
repository: whitews/FlowUtils
36+
ref: develop
37+
path: flowutils
38+
2839
- name: Checkout FlowKit (develop)
2940
uses: actions/checkout@v4
3041
with:
3142
repository: whitews/FlowKit
3243
ref: develop
3344
path: flowkit
3445

46+
- name: Install FlowIO
47+
working-directory: flowio
48+
run: |
49+
pip install .
50+
51+
- name: Install FlowUtils
52+
working-directory: flowutils
53+
run: |
54+
pip install .
55+
3556
- name: Install FlowKit
3657
working-directory: flowkit
3758
run: |
38-
pip install --upgrade pip
3959
pip install .
40-
pip install ../flowio
4160
4261
- name: Run FlowKit tests
4362
working-directory: flowkit

.github/workflows/test_flowkit_master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
python-version: ["3.10"]
14+
python-version: ["3.12"]
1515

1616
steps:
1717
- name: Setup Python

.readthedocs.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ build:
88
python:
99
install:
1010
- requirements: docs/requirements.txt
11+
- method: pip
12+
path: .
13+
extra_requirements:
14+
- docs
1115

1216
sphinx:
1317
configuration: docs/conf.py

README.md

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,18 @@
1414

1515
## Overview
1616

17-
FlowIO is a Python library for reading / writing Flow Cytometry Standard (FCS)
18-
files, with zero external dependencies and is compatible with Python 3.7+.
19-
20-
FlowIO retrieves event data exactly as it is encoded in the FCS file: as a
21-
1-dimensional list without separating the events into channels or performing
22-
any preprocessing (e.g. applying gain). Metadata stored in the FCS file is
23-
available as a dictionary via the 'text' attribute. Basic attributes are also
24-
available for commonly accessed properties. For example, the channel count
25-
can be used to easily convert the event data to a multi-column NumPy array:
26-
27-
```
28-
import flowio
29-
import numpy
30-
31-
fcs_data = flowio.FlowData('example.fcs')
32-
npy_data = numpy.reshape(fcs_data.events, (-1, fcs_data.channel_count))
33-
```
34-
35-
For higher level interaction with flow cytometry data, including GatingML and FlowJo 10 support,
36-
see the related [FlowKit](https://github.com/whitews/FlowKit) project.
17+
FlowIO is a Python library for reading and writing Flow Cytometry Standard (FCS)
18+
files, with minimal dependencies and is compatible with Python 3.9+. It is intended
19+
as a lightweight library, suitable for parsing FCS data sets (e.g. as a web server
20+
backend, for simple metadata extraction, etc.). It is **highly recommended** that
21+
one be familiar with the various FCS file standards (2.0, 3.0, 3,1) before using
22+
FlowIO for downstream analysis. For higher level cytometry analysis, please see the
23+
related [FlowKit](https://github.com/whitews/FlowKit) library which offers a much
24+
wider set of analysis options such as compensation, transformation, and gating
25+
support (including support for importing FlowJo 10 workspaces).
26+
27+
If you have any questions about FlowIO, find any bugs, or feel something is missing
28+
from the documentation [please submit an issue to the GitHub repository here](https://github.com/whitews/FlowIO/issues/new/).
3729

3830
## Installation
3931

File renamed without changes.
File renamed without changes.
91.2 KB
Binary file not shown.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)