Merge pull request #9 from ejohnstown/build-update

Build Update

README.rst

@@ -26,7 +26,7 @@ We provide Python wheels (prebuilt binaries) for OSX 64 bits and Linux 64 bits:
 To build wolfcrypt-py against a local installation of the native C wolfSSL
 library, use the USE_LOCAL_WOLFSSL variable.  This variable should be
 
-wolfcrypt-py can be built against a local verison of the native wolfSSL
+wolfcrypt-py can be built against a local version of the native wolfSSL
 library by using pip with the USE_LOCAL_WOLFSSL variable. USE_LOCAL_WOLFSSL
 should be set equal to the installation path for the wolfSSL library:
 

make/manylinux1/build_wheels.sh

@@ -6,5 +6,5 @@ docker run \
     --rm \
     -v `pwd`:/wolfcrypt-py \
     -w /wolfcrypt-py \
-    quay.io/pypa/manylinux1_x86_64 \
+    wolfssl/manylinux1-x86_64 \
     bash -c "make/manylinux1/build.sh"

make/osx/build_wheels.sh

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