From 6ac617bae1871dc6dcd53c1108376f2a920541a0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 1 Sep 2015 16:23:04 -0400
Subject: [PATCH] Split requirements-build.txt from requirements-dev.txt to
 support a leaner tox.ini

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 Dockerfile               | 2 +-
 requirements-build.txt   | 1 +
 requirements-dev.txt     | 1 -
 script/build-linux       | 1 -
 script/build-linux-inner | 9 ++++++---
 script/build-osx         | 2 +-
 script/ci                | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 requirements-build.txt

diff --git a/Dockerfile b/Dockerfile
index a9892031b..1d13c2b60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -91,7 +91,7 @@ RUN pip install -r requirements-dev.txt
 RUN pip install tox==2.1.1
 
 ADD . /code/
-RUN python setup.py install
+RUN pip install --no-deps -e /code
 
 RUN chown -R user /code/
 
diff --git a/requirements-build.txt b/requirements-build.txt
new file mode 100644
index 000000000..5da6fa496
--- /dev/null
+++ b/requirements-build.txt
@@ -0,0 +1 @@
+git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
diff --git a/requirements-dev.txt b/requirements-dev.txt
index adb4387df..33a491515 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,5 @@
 coverage==3.7.1
 flake8==2.3.0
-git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
 mock >= 1.0.1
 nose==1.3.4
 pep8==1.6.1
diff --git a/script/build-linux b/script/build-linux
index 5e4a9470e..4fdf1d926 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -6,7 +6,6 @@ TAG="docker-compose"
 docker build -t "$TAG" .
 docker run \
   --rm \
-  --user=user \
   --volume="$(pwd):/code" \
   --entrypoint="script/build-linux-inner" \
   "$TAG"
diff --git a/script/build-linux-inner b/script/build-linux-inner
index adc030eaa..cfea83806 100755
--- a/script/build-linux-inner
+++ b/script/build-linux-inner
@@ -2,9 +2,12 @@
 
 set -ex
 
+TARGET=dist/docker-compose-Linux-x86_64
+
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
-pyinstaller -F bin/docker-compose
-mv dist/docker-compose dist/docker-compose-Linux-x86_64
-dist/docker-compose-Linux-x86_64 version
+pip install -r requirements-build.txt
+su -c "pyinstaller -F bin/docker-compose" user
+mv dist/docker-compose $TARGET
+$TARGET version
diff --git a/script/build-osx b/script/build-osx
index 2a9cf512e..d99c1fb98 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -6,7 +6,7 @@ PATH="/usr/local/bin:$PATH"
 rm -rf venv
 virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
-venv/bin/pip install -r requirements-dev.txt
+venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install .
 venv/bin/pyinstaller -F bin/docker-compose
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
diff --git a/script/ci b/script/ci
index b49754878..e392fae75 100755
--- a/script/ci
+++ b/script/ci
@@ -13,4 +13,4 @@ export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
-su -c script/build-linux-inner user
+. script/build-linux-inner