Skip to content

Commit

Permalink
prereq
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Nov 14, 2017
1 parent b14e58c commit b379bff
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 29 deletions.
28 changes: 6 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
language: generic
language: python
fast_finish: true

python:
- 3.6

os:
- linux
- osx

env:
- TRAVIS_PYTHON_VERSION=3.5
- TRAVIS_PYTHON_VERSION=3


notifications:
email: false
Expand All @@ -17,24 +16,9 @@ git:


before_install:
- if [[ $TRAVIS_OS_NAME == osx ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
else
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi

- bash miniconda.sh -b -p $HOME/miniconda
- export PATH=$HOME/miniconda/bin:$PATH
- hash -r

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

install:
- pip install -e .
install: pip install -e .

script: coverage run tests/test.py -v

Expand Down
1 change: 0 additions & 1 deletion OpenCV_readavi_codec.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env python
# -*- coding: future_fstrings -*-
"""
scans a directory for all videos and plays them, helping show which codecs you might be having a problem with
"""
Expand Down
5 changes: 5 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
.. image:: https://travis-ci.org/scivision/pyimagevideo.svg?branch=master
:target: https://travis-ci.org/scivision/pyimagevideo

.. image:: https://coveralls.io/repos/github/scivision/pyimagevideo/badge.svg?branch=master
:target: https://coveralls.io/github/scivision/pyimagevideo?branch=master

.. image:: https://api.codeclimate.com/v1/badges/f9bdbab86e37a3680cfe/maintainability
:target: https://codeclimate.com/github/scivision/pyimagevideo/maintainability
:alt: Maintainability

============
pyimagevideo
Expand Down
1 change: 0 additions & 1 deletion pyimagevideo/imagemultipage.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: future_fstrings -*-
import logging
from pathlib import Path
import re
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
req=['numpy','scipy','scikit-image','matplotlib',
'morecvutils','future-fstrings']
req=['numpy','scipy']
# %%
from setuptools import setup

Expand All @@ -15,6 +14,7 @@
'Programming Language :: Python :: 3',
],
install_requires = req,
python_requires='>=3.5',
extras_require={'plot': ['tifffile']}
python_requires='>=3.6',
extras_require={'io': ['h5py','scikit-image','matplotlib','tifffile',
'morecvutils']}
)
1 change: 0 additions & 1 deletion wavelength2rgb.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env python
# -*- coding: future_fstrings -*-
from __future__ import division

def wavelength_to_rgb(wavelength, gamma=0.8):
Expand Down

0 comments on commit b379bff

Please sign in to comment.