From 9f70f72cb6d1855a2c8809ccc5c134296c65bb6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mois=C3=A9s=20Guimar=C3=A3es=20de=20Medeiros?=
 <moises.guimaraes@pm.me>
Date: Mon, 23 Jul 2018 23:14:36 +0100
Subject: [PATCH] fix setup and update python versions

---
 .gitignore                      | 7 ++-----
 make/manylinux1/build_wheels.sh | 2 +-
 make/osx/build_wheels.sh        | 2 +-
 make/osx/install_python.sh      | 6 +++---
 setup.py                        | 1 +
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74b3cee..08bc776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,11 +63,8 @@ target/
 # pyenv python configuration file
 .python-version
 
-# pyenv dist build
-venv_2.7
-venv_3.4
-venv_3.5
-venv_3.6
+# macos `make dist` venvs
+venv_*
 
 # code editor preferences
 .vscode
diff --git a/make/manylinux1/build_wheels.sh b/make/manylinux1/build_wheels.sh
index e836814..f08d126 100755
--- a/make/manylinux1/build_wheels.sh
+++ b/make/manylinux1/build_wheels.sh
@@ -6,5 +6,5 @@ docker run \
     --rm \
     -v `pwd`:/wolfcrypt-py \
     -w /wolfcrypt-py \
-    wolfssl/manylinux1-x86_64 \
+    quay.io/pypa/manylinux1_x86_64 \
     bash -c "make/manylinux1/build.sh"
diff --git a/make/osx/build_wheels.sh b/make/osx/build_wheels.sh
index 4ea8826..e109b11 100755
--- a/make/osx/build_wheels.sh
+++ b/make/osx/build_wheels.sh
@@ -1,7 +1,7 @@
 set -e
 set +x
 
-for PYVERSION in 2.7 3.4 3.5 3.6; do
+for PYVERSION in 2.7 3.5 3.6 3.7; do
     virtualenv -p /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/python${PYVERSION} venv_${PYVERSION}
     . ./venv_${PYVERSION}/bin/activate
     pip install -r requirements/setup.txt
diff --git a/make/osx/install_python.sh b/make/osx/install_python.sh
index 314e8fe..0732f10 100755
--- a/make/osx/install_python.sh
+++ b/make/osx/install_python.sh
@@ -3,10 +3,10 @@ set -euo pipefail
 set -x
 
 URLS=(
-    'https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg'
-    'https://www.python.org/ftp/python/3.4.4/python-3.4.4-macosx10.6.pkg'
+    'https://www.python.org/ftp/python/2.7.15/python-2.7.15-macosx10.6.pkg'
     'https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'
-    'https://www.python.org/ftp/python/3.6.4/python-3.6.4-macosx10.6.pkg'
+    'https://www.python.org/ftp/python/3.6.6/python-3.6.6-macosx10.6.pkg'
+    'https://www.python.org/ftp/python/3.7.0/python-3.7.0-macosx10.6.pkg'
 )
 
 for url in "${URLS[@]}"; do
diff --git a/setup.py b/setup.py
index 4229c13..03a3bf7 100755
--- a/setup.py
+++ b/setup.py
@@ -85,6 +85,7 @@ setup(
         u"Topic :: Software Development"
     ],
 
+    setup_requires=["cffi"],
     install_requires=["cffi"],
     cmdclass={"build_ext" : cffiBuilder}
 )