Split requirements-build.txt from requirements-dev.txt to support a leaner tox.ini

Signed-off-by: Daniel Nephin <[email protected]>

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/
 

requirements-build.txt

@@ -0,0 +1 @@
+git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller

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

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"

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

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

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