From 488f881d708bc54e86ed375ee97aa94540808fa1 Mon Sep 17 00:00:00 2001
From: Robert Nishihara <robertnishihara@gmail.com>
Date: Sat, 12 Nov 2016 19:36:47 -0800
Subject: [PATCH] Install numpy before building numbuf in setup.py. (#20)

---
 install-dependencies.sh | 13 +++++--------
 setup.py                |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/install-dependencies.sh b/install-dependencies.sh
index 8d7de5288..88973f6de 100755
--- a/install-dependencies.sh
+++ b/install-dependencies.sh
@@ -15,7 +15,11 @@ else
   exit 1
 fi
 
-if [[ $platform == "macosx" ]]; then
+if [[ $platform == "linux" ]]; then
+  # These commands must be kept in sync with the installation instructions.
+  sudo apt-get update
+  sudo apt-get install -y cmake build-essential autoconf libtool python-dev python-numpy libboost-all-dev
+elif [[ $platform == "macosx" ]]; then
   # check that brew is installed
   which -s brew
   if [[ $? != 0 ]]; then
@@ -25,13 +29,6 @@ if [[ $platform == "macosx" ]]; then
     echo "Updating brew."
     brew update
   fi
-fi
-
-if [[ $platform == "linux" ]]; then
-  # These commands must be kept in sync with the installation instructions.
-  sudo apt-get update
-  sudo apt-get install -y cmake build-essential autoconf libtool python-dev python-numpy python-pip libboost-all-dev
-elif [[ $platform == "macosx" ]]; then
   # These commands must be kept in sync with the installation instructions.
   brew install cmake automake autoconf libtool boost
   sudo easy_install pip
diff --git a/setup.py b/setup.py
index 27b82a9de..ce9a51bc7 100644
--- a/setup.py
+++ b/setup.py
@@ -19,5 +19,6 @@ setup(name="numbuf",
       packages=find_packages(),
       package_data={"numbuf": ["libnumbuf.so"]},
       cmdclass={"install": install},
+      setup_requires=["numpy"],
       include_package_data=True,
       zip_safe=False)