From 4bcd9f1b7619f6f058c4c15acb16d76d59dba762 Mon Sep 17 00:00:00 2001
From: Morten Dahl <mortendahlcs@gmail.com>
Date: Thu, 29 Aug 2019 16:30:29 +0200
Subject: [PATCH] fix build dependencies

---
 .circleci/config.yml | 8 +++-----
 bundle.sh            | 3 +++
 requirements-dev.txt | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7413dc3..8876660 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,7 +48,7 @@ commands:
           name: Install requirements-dev.txt in '<< parameters.python-environment >>'
           command: |
             . << parameters.python-environment >>/bin/activate
-            pip install -q -r requirements-dev.txt
+            pip install -q -U -r requirements-dev.txt
             pip freeze
       - run:
           name: Install TensorFlow << parameters.tensorflow-version >> in '<< parameters.python-environment >>'
@@ -94,8 +94,7 @@ commands:
           name: Install requirements-dev.txt in '<< parameters.python-environment >>'
           command: |
             . << parameters.python-environment >>/bin/activate
-            pip install -q -r requirements-dev.txt
-            pip install -q -U wheel
+            pip install -q -U -r requirements-dev.txt
             pip freeze
       - attach_workspace:
           at: ./out
@@ -112,7 +111,6 @@ commands:
             python --version
             pip freeze
             DIR_TAGGED=./out/merged DIR_WHEEL=./out/wheelhouse make bundle
-            python -m twine check ./out/wheelhouse/*.whl
             tree ./out
       - persist_to_workspace:
           root: ./out
@@ -285,7 +283,7 @@ jobs:
           name: Configure 'deploy-3.6'
           command: |
             . deploy-py3.6/bin/activate
-            pip install -q -U twine
+            pip install -q -U -r requirements-dev.txt
       - run:
           name: Upload to PyPI
           command: |
diff --git a/bundle.sh b/bundle.sh
index 076ab08..69892e8 100755
--- a/bundle.sh
+++ b/bundle.sh
@@ -24,6 +24,7 @@ if [ $OS_NAME == "darwin" ]; then
   pushd ${TMP}
   python setup.py bdist_wheel > /dev/null
   popd
+  python -m twine check ${TMP}/dist/*.whl
   cp ${TMP}/dist/*.whl ${OUT}
 
 elif [ $OS_NAME == "linux" ]; then
@@ -31,8 +32,10 @@ elif [ $OS_NAME == "linux" ]; then
   python setup.py bdist_wheel > /dev/null
   auditwheel repair dist/*.whl
   popd
+  python -m twine check ${TMP}/wheelhouse/*.whl
   cp ${TMP}/wheelhouse/*.whl ${OUT}
 
 else
   echo "Don't know how to bundle package for '$OS_NAME'"
+  exit 1
 fi
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 52de9f2..bf5dd1b 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,6 @@
 cpplint==1.4.4
 numpy==1.16.4
+pip==19.2.3
+setuptools==41.2.0
 twine==1.13.0
+wheel==0.33.6