summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Beierl <mark.beierl@emc.com>2016-02-03 17:18:54 -0500
committerMark Beierl <mark.beierl@emc.com>2016-02-03 17:18:54 -0500
commitfd4b99b086583bc8dc91950393ffed646f7eee59 (patch)
tree078d2719a305af06129758791c68942aa23bb9c1
parent97c1f3aa36cd17bfcfebcd7bbc7fb60eb6e3d456 (diff)
Developer build process fix
Fix the installation os setuptools so that it does not conflict with mock. Change-Id: I7c497d36c80a795fc99b329da2d171a265e4eacc JIRA: STORPERF-35 Signed-off-by: Mark Beierl <mark.beierl@emc.com>
-rwxr-xr-xci/merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/merge.sh b/ci/merge.sh
index ddcc0eb..ca55281 100755
--- a/ci/merge.sh
+++ b/ci/merge.sh
@@ -16,7 +16,7 @@ fi
virtualenv $WORKSPACE/storperf_venv
source $WORKSPACE/storperf_venv/bin/activate
-easy_install -U setuptools
+pip install --upgrade setuptools
pip install nose -I
pip install coverage -I
python ci/setup.py develop