fix travis ci build integration

Author: cconlon

.travis.yml

@@ -1,9 +1,5 @@
 sudo: required
 
-branches:
-  only:
-    - master
-
 matrix:
   include:
     - dist: trusty
@@ -13,7 +9,7 @@ matrix:
       script:
         - ./make/manylinux1/build_wheels.sh
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       script:
         - ./make/osx/build_wheels.sh
 

make/manylinux1/build.sh

@@ -11,7 +11,7 @@ for PYBIN in /opt/python/*/bin; do
 done
 
 # Bundle external shared libraries into the wheels
-for whl in dist/*.whl; do
+for whl in dist/wolfssl*.whl; do
     auditwheel repair "$whl" -w tmpdist/
 done
 

make/osx/build_wheels.sh

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

setup.py

@@ -44,17 +44,6 @@
     long_description = long_description.replace(".. include:: LICENSING.rst\n",
                                                 licensing_file.read())
 
-
-# requirements
-install_requires = [
-    'cffi'
-]
-test_requires = [
-    'tox'
-    'pytest'
-]
-
-
 class cffiBuilder(build_ext, object):
 
     def build_extension(self, ext):
@@ -68,7 +57,6 @@ def build_extension(self, ext):
 
         super(cffiBuilder, self).build_extension(ext)
 
-
 setup(
     name=wolfssl.__title__,
     version=wolfssl.__version__,
@@ -83,7 +71,6 @@ def build_extension(self, ext):
     package_dir={"":package_dir},
 
     zip_safe=False,
-    cffi_modules=["./src/wolfssl/_build_ffi.py:ffi"],
 
     keywords="wolfssl, wolfcrypt, security, cryptography",
     classifiers=[
@@ -99,8 +86,10 @@ def build_extension(self, ext):
         u"Topic :: Software Development"
     ],
 
-    install_requires=install_requires,
+    setup_requires=["cffi"],
+    cffi_modules=["./src/wolfssl/_build_ffi.py:ffi"],
+    install_requires=["cffi"],
     test_suite="tests",
-    tests_require=test_requires,
+    tests_require=["tox", "pytest"],
     cmdclass={"build_ext" : cffiBuilder}
 )