test py35 build for os x

Author: skvark

.travis.yml

@@ -26,59 +26,8 @@ matrix:
   include:
     - os: osx
       language: generic
-      env:
-        - MB_PYTHON_VERSION=2.7
-    - os: osx
-      language: generic
-      env:
-        - MB_PYTHON_VERSION=3.4
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-        - UNICODE_WIDTH=16
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-        - UNICODE_WIDTH=16
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.3
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.3
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.4
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.4
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
-    - os: linux
-      env:
-        - MB_PYTHON_VERSION=3.5
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-    - os: linux
       env:
         - MB_PYTHON_VERSION=3.5
-        - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
-        - PLAT=i686
 
 before_install:
     - source multibuild/common_utils.sh

travis/build-wheels-osx.sh

@@ -3,27 +3,11 @@ set +e
 echo 'Begin build-wheel OSX ...'
 
 export PYTHON_VERSION=${MB_PYTHON_VERSION/./}
-echo 'MB_PYTHON_VERSION: 'MB_PYTHON_VERSION
+echo 'MB_PYTHON_VERSION: ' $MB_PYTHON_VERSION
 echo 'PYTHON_VERSION: '$PYTHON_VERSION
 
 echo 'PIP and brew installs'
 
-brew install cmake pkg-config
-brew install jpeg libpng libtiff openexr
-brew install eigen tbb
-
-if [[ $PYTHON_VERSION == 3* ]]; then
-  brew install python3
-  pip3 install numpy
-fi
-
-if [[ $PYTHON_VERSION == 2* ]]; then
-  pip install numpy
-fi
-
-echo 'Begin our build'
-ls -lh
-
 pip install -r requirements.txt
 
 echo 'Config make'
@@ -43,8 +27,8 @@ if [[ $PYTHON_VERSION == 2* ]]; then
   	-D BUILD_EXAMPLES=OFF ..
 fi
 
-if [[ $PYTHON_VERSION == 3* ]]; then
-  echo 'Config for Py3'
+if [[ $PYTHON_VERSION == 34 ]]; then
+  echo 'Config for Py34'
   cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local \
     -D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
     -D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
@@ -54,6 +38,17 @@ if [[ $PYTHON_VERSION == 3* ]]; then
     -D BUILD_EXAMPLES=OFF ..
 fi
 
+if [[ $PYTHON_VERSION == 35 ]]; then
+  echo 'Config for Py35'
+  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local \
+    -D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
+    -D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
+    -D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.5.1/Frameworks/Python.framework/Versions/3.5/bin \
+    -D PYTHON3_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.5/include/python3.5m \
+    -D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF \
+    -D BUILD_EXAMPLES=OFF ..
+fi
+
 echo 'Begin build'
 make -j4