Skip to content

Commit

Permalink
template
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Nov 14, 2017
1 parent 43be48b commit b14e58c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ os:
- linux
- osx

#env:
# - TRAVIS_PYTHON_VERSION=3.6

env:
- TRAVIS_PYTHON_VERSION=3.5
- TRAVIS_PYTHON_VERSION=3

notifications:
email: false
Expand All @@ -29,12 +29,12 @@ before_install:

- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
# - conda create -n test python=$TRAVIS_PYTHON_VERSION
# - source activate test
- conda create -n test python=$TRAVIS_PYTHON_VERSION
- source activate test
- pip -q install coveralls

install:
- python setup.py develop
- pip install -e .

script: coverage run tests/test.py -v

Expand Down
9 changes: 9 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ pyimagevideo
Functions to **write multipage images** and **make videos** from Numpy arrays.
Also includes functions to test Matlab and Python codecs

Install
=======
::

pip install -e .

Scripts
=======

``Convert_HDF5_to_AVI.py`` converts HDF5 video data to AVI.
Typically used in biomedical and science imaging, where they use HDF5 instead of TIFF, since HDF5 is a very widespread, fast file format that can store arbitrarily large datasets and metadata.
It is recommended to researchers to use HDF5 instead of TIFF, FITS, CDF or proprietary formats for large data streams, including lossless video.
Expand Down
18 changes: 5 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
#!/usr/bin/env python
req=['numpy','scipy','scikit-image','matplotlib']
pipreq = ['morecvutils','future-fstrings']

import pip
try:
import conda.cli
conda.cli.main('install',*req)
except Exception as e:
import pip
pip.main(['install'] + req)
pip.main(['install'] + pipreq)
req=['numpy','scipy','scikit-image','matplotlib',
'morecvutils','future-fstrings']
# %%
from setuptools import setup

Expand All @@ -23,6 +14,7 @@
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3',
],
install_requires = req+pipreq,
extras_require={'tifffiles': ['tifffile']}
install_requires = req,
python_requires='>=3.5',
extras_require={'plot': ['tifffile']}
)

0 comments on commit b14e58c

Please sign in to comment.