Merge pull request #10 from WillBrennan/feature/travis-fixup

travis cleanup

.travis.yml

 language: python
-
-matrix:
-  include:
-    - python: "2.7"
-
-before_install:
-    # update aptitude
-    - sudo apt-get update
-    - sudo apt-get install -y python-opencv
-
-    # help python importing cv and/or cv2
-    - export PYTHONPATH=$PYTHONPATH:/usr/lib/pymodules/python$TRAVIS_PYTHON_VERSION
-
-    # verify all requirements were met
-    - INSTALLDIR=$(python -c "import os; import numpy; import cv; import cv2; print(os.path.dirname(cv2.__file__))")
-
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
 install:
-    - make install
-
+  - make install
 script:
     - make test
\ No newline at end of file

requirements.txt

+wheel
 pytest
 sphinx
 numpy
+opencv-python
\ No newline at end of file

skin_detector/__init__.py

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 __author__ = 'willbrennan'
 
-from skin_detector import *
-from scripts import display
+from .skin_detector import *
+from .scripts import display
 
 __all__ = [
     "process", "display", "get_hsv_mask", "get_rgb_mask", "get_ycrcb_mask", "grab_cut_mask", "grab_cut_mask", "closing"

skin_detector/scripts.py

@@ -2,13 +2,10 @@
 # -*- coding: utf-8 -*-
 __author__ = 'Will Brennan'
 
-# Built-in Modules
-# Standard Modules
+
 import cv2
 import numpy
 
-# Custom Modules
-
 
 def display(title, img, max_size=200000):
     assert isinstance(img, numpy.ndarray), 'img must be a numpy array'

skin_detector/skin_detector.py

@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 __author__ = 'Will Brennan'
 
-# Built-in Modules
 import logging
 import cv2
 import numpy
-import scripts
+
+from . import scripts
 
 logger = logging.getLogger('main')