Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
whitews committed Mar 29, 2024
2 parents cefd6e6 + c4f503c commit 1040bf6
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 18 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test_base.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build & test
name: Test

on:
workflow_call:
Expand All @@ -16,12 +16,13 @@ jobs:
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install
run: |
pip install --upgrade pip
pip install coverage
pip install -e .[test]
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test_flowkit_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -35,7 +35,8 @@ jobs:
- name: Install FlowKit
working-directory: flowkit
run: |
pip install -r requirements.txt
pip install --upgrade pip
pip install .
pip install ../flowio
- name: Run FlowKit tests
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test_flowkit_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -35,7 +35,8 @@ jobs:
- name: Install FlowKit
working-directory: flowkit
run: |
pip install -r requirements.txt
pip install --upgrade pip
pip install .
pip install ../flowio
- name: Run FlowKit tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_develop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build & test (develop)
name: Test (develop)

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_master.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build & test (master)
name: Test (master)

on:
push:
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
[![DOI](https://zenodo.org/badge/14634514.svg)](https://zenodo.org/badge/latestdoi/14634514)


[![Build & test (master)](https://github.com/whitews/FlowIO/actions/workflows/tests_master.yml/badge.svg)](https://github.com/whitews/FlowIO/actions/workflows/tests_master.yml)
[![Build & test (develop)](https://github.com/whitews/FlowIO/actions/workflows/tests_develop.yml/badge.svg)](https://github.com/whitews/FlowIO/actions/workflows/tests_develop.yml)
[![Test (master)](https://github.com/whitews/FlowIO/actions/workflows/tests_master.yml/badge.svg)](https://github.com/whitews/FlowIO/actions/workflows/tests_master.yml)
[![Test (develop)](https://github.com/whitews/FlowIO/actions/workflows/tests_develop.yml/badge.svg)](https://github.com/whitews/FlowIO/actions/workflows/tests_develop.yml)
[![Coverage](https://codecov.io/gh/whitews/FlowIO/branch/master/graph/badge.svg)](https://codecov.io/gh/whitews/flowio)
[![Documentation Status](https://readthedocs.org/projects/flowio/badge/?version=latest)](https://flowio.readthedocs.io/en/latest/?badge=latest)
![PyPI - Downloads](https://img.shields.io/pypi/dm/flowio)

## Overview

Expand Down
17 changes: 10 additions & 7 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ FlowIO Documentation
.. image:: https://img.shields.io/pypi/pyversions/flowio.svg
:target: https://pypi.org/project/flowio/

.. image:: https://img.shields.io/pypi/dm/flowio
:alt: PyPI - Downloads

FlowIO is a Python library for reading / writing Flow Cytometry Standard (FCS)
files, with zero external dependencies and is compatible with Python 3.7+.

Expand All @@ -38,29 +41,29 @@ FlowJo 10 support, see the related FlowKit_ project.

.. _FlowKit: https://github.com/whitews/FlowKit

Changelogs
__________

`Changelogs for versions are available here <https://github.com/whitews/FlowIO/releases>`_

Installation
------------

The recommended way to install FlowIO is via the `pip` command:

.. code-block:: python
.. code-block::
pip install flowio
Or, if you prefer, you can install from the GitHub source:

.. code-block:: python
.. code-block::
git clone https://github.com/whitews/flowio
cd flowio
pip install .
Changelogs
__________

`Changelogs for versions are available here <https://github.com/whitews/FlowIO/releases>`_

----

API
Expand Down
2 changes: 1 addition & 1 deletion src/flowio/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
FlowIO version
"""
__version__ = "1.2.2b3"
__version__ = "1.3.0b0"

0 comments on commit 1040bf6

Please sign in to comment.