Skip to content

Commit d22309e

Browse files
committed
Merge branch 'master' of github.com:joefutrelle/pyifcb into partialFileset87
2 parents 3f8348f + 59b143e commit d22309e

File tree

5 files changed

+97
-75
lines changed

5 files changed

+97
-75
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Test Pip Install
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
test-pip-install:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
python-version: ["3.9", "3.10", "3.11", "3.12"]
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Set up Python ${{ matrix.python-version }}
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: ${{ matrix.python-version }}
22+
23+
- name: Test pip installation
24+
run: |
25+
python -m pip install --upgrade pip
26+
python -m pip install .
27+
python -c "import ifcb"

README.md

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,32 @@
1-
# pyifcb - Imaging FlowCytobot Python API, generation 2
1+
# pyifcb - Imaging FlowCytobot Python API
22

33
## Overview
44

5-
This module provides facilities for accessing and managing data generated by the Imaging FlowCytobot. It can read and write IFCB data in various formats, including the instrument's native format, and can serve as the basis of any application that uses IFCB data.
5+
This module provides facilities for accessing data generated by the Imaging FlowCytobot. It can read and write IFCB data in various formats, including the instrument's native format, and can serve as the basis of any application that uses IFCB data.
66

7-
Generation 1 of this data system was called the IFCB Data Dashboard. In this, generation 2, features of the dashboard are being broken out into smaller, independent modules that can be used together.
8-
9-
## Authors and contributors
10-
11-
Joe Futrelle ([email protected]) - Woods Hole Oceanographic Institution
12-
13-
## Installation via anaconda
14-
15-
To create a conda environment called "pyifcb":
7+
## Installation
168

9+
### With `pip`:
1710
```
18-
conda env create -f environment.yml
19-
conda activate pyifcb
20-
python setup.py install
11+
pip install git+https://github.com/joefutrelle/pyifcb
2112
```
13+
It is strongly recommended that you use a version tag when installing pyifcb. See [releases](https://github.com/joefutrelle/pyifcb/releases) for available version tags.
2214

23-
Or to update an existing conda environment:
24-
15+
For example to install pyifcb 1.1.1,
2516
```
26-
conda update -n {name of existing envrionment} -f environment.yml
27-
conda activate {name of existing environment}
28-
python setup.py install
17+
pip install 'git+https://github.com/joefutrelle/[email protected]'
2918
```
3019

31-
If you want to update your pyifcb installation when the code is updated, use `python setup.py develop` instead.
32-
33-
## Status
20+
### From the latest git commit:
21+
```
22+
git clone https://github.com/joefutrelle/pyficb
23+
cd pyifcb
24+
pip install .
25+
```
3426

35-
As of 2017-04-28 pyifcb requires Python 3.
27+
## Documentation
3628

37-
As of 2017-01-04 this is mostly complete and the APIs are not likely to change much, but there is no stable release yet so APIs may still change. The Wiki and code-level documentation is up to date.
29+
For complete documentation, see this repo's [wiki](https://github.com/joefutrelle/pyifcb/wiki).
3830

3931
![Build status](https://github.com/joefutrelle/pyifcb/actions/workflows/python-package.yml/badge.svg)
4032

environment.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

pyproject.toml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
[build-system]
2+
requires = ["hatchling"]
3+
build-backend = "hatchling.build"
4+
5+
[project]
6+
name = "pyifcb"
7+
version = "1.1.1"
8+
description = "Imaging FlowCytobot Python API, generation 2"
9+
readme = "README.md"
10+
authors = [{name = "Joe Futrelle", email = "[email protected]"}]
11+
classifiers = [
12+
'Development Status :: 3 - Alpha',
13+
'Intended Audience :: Developers',
14+
'Intended Audience :: Science/Research',
15+
'License :: OSI Approved :: MIT License',
16+
'Operating System :: POSIX :: Linux',
17+
'Programming Language :: Python',
18+
'Topic :: Scientific/Engineering',
19+
]
20+
keywords = ['FlowCytobot','Imaging','ifcb']
21+
dependencies = [
22+
"scipy",
23+
"pandas",
24+
"h5py",
25+
"requests",
26+
"Pillow",
27+
"rectpack",
28+
"scikit-image",
29+
"pysmb",
30+
"smbprotocol",
31+
"pyyaml",
32+
]
33+
34+
[tool.hatch.build.targets.wheel]
35+
include = [
36+
"ifcb/**/*",
37+
"docs/**/*",
38+
"auto_transfer.py",
39+
"VERSION",
40+
"LICENSE",
41+
"README.md",
42+
"transfer_config.yml.example",
43+
]
44+
45+
[project.scripts]
46+
auto_transfer = "auto_transfer:main"
47+
48+
[tool.hatch.metadata]
49+
allow-direct-references = true
50+
51+
[project.urls]
52+
Repository = "https://github.com/joefutrelle/pyifcb"
53+
Documentation = "https://github.com/joefutrelle/pyifcb/wiki"
54+
Issues = "https://github.com/joefutrelle/pyifcb/issues"

setup.py

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)