Merge pull request #12 from ejohnstown/build-update

Build Update

Author: cconlon

.gitignore

@@ -64,10 +64,7 @@ target/
 .python-version
 
 # pyenv dist build
-venv_2.7
-venv_3.4
-venv_3.5
-venv_3.6
+venv_*
 
 # code editor preferences
 .vscode

.travis.yml

@@ -9,7 +9,7 @@ matrix:
       script:
         - ./make/manylinux1/build_wheels.sh
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode8.3
       script:
         - ./make/osx/build_wheels.sh
 

make/osx/build_wheels.sh

@@ -1,30 +1,26 @@
 set -e
 set +x
 
-for PYVERSION in 2.7 3.4 3.5 3.6; do
-    PYTHONBIN=/Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin
-    PYTHONEXE=${PYTHONBIN}/python${PYVERSION}
-    export PATH="${PYTHONBIN}":$PATH
+for VER in 2.7 3.4 3.5 3.6 3.7; do
+    PIP="pip${VER}"
+    PYTHON="python${VER}"
+    VENV="venv_${VER}"
 
     # update pip for newer TLS support
-    curl https://bootstrap.pypa.io/get-pip.py | ${PYTHONEXE}
-    "${PYTHONBIN}/pip" install --upgrade pip
+    curl https://bootstrap.pypa.io/get-pip.py | ${PYTHON}
+    ${PIP} install -r requirements/setup.txt
 
     # update virtualenv
-    ${PYTHONEXE} -m pip install virtualenv
+    ${PIP} install --upgrade virtualenv
+    virtualenv -p ${PYTHON} ${VENV}
+    . ./${VENV}/bin/activate
 
-    virtualenv -p ${PYTHONEXE} venv_${PYVERSION}
-    . ./venv_${PYVERSION}/bin/activate
-
-    # install cffi module
-    ${PYTHONEXE} -m pip install cffi
-
-    ${PYTHONEXE} setup.py bdist_wheel
-    "${PYTHONBIN}/pip" install -r requirements/test.txt
+    ${PYTHON} setup.py bdist_wheel
+    ${PIP} install -r requirements/test.txt
     set +e
-    "${PYTHONBIN}/pip" uninstall -y wolfssl
+    ${PIP} uninstall -y wolfssl
     set -e
-    "${PYTHONBIN}/pip" install wolfssl --no-index -f dist
+    ${PIP} install wolfssl --no-index -f dist
     rm -rf tests/__pycache__
     py.test tests
     deactivate