From 9f65c7479caad0101591db36ef8d4f07057399ce Mon Sep 17 00:00:00 2001
From: Is Isilon <wassname@wassname.org>
Date: Wed, 6 Jan 2016 18:06:21 +0800
Subject: [PATCH] Bring reqs in line with origin

---
 Dockerfile | 4 ++--
 build.sh   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0f4dfcb..e43c154 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,8 @@ ARG PIP_TRUSTED_HOST=127.0.0.1
 ENV DEVPI_VERSION $DEVPI_VERSION
 
 RUN NO_PROXY=$PIP_TRUSTED_HOST pip --trusted-host $PIP_TRUSTED_HOST install -i $PIP_INDEX_URL --upgrade \
-  "devpi-client>=2.3" "requests>=2.9.0" \
-  "devpi-server==${DEVPI_VERSION:-2.5.3}"
+    "devpi-client>=2.3.0,<2.4" \
+    "devpi-server==$DEVPI_VERSION"
 
 EXPOSE 3141
 VOLUME /data
diff --git a/build.sh b/build.sh
index 7c2a5b1..c242cec 100755
--- a/build.sh
+++ b/build.sh
@@ -22,7 +22,6 @@ DEVPI_VERSION="2.5.3"
 
 image="${REPO}/devpi"
 echo "################################################################### ${image}"
-
 ## warm up cache for CI
 docker pull ${image} || true