From c4e424d2de2aa9376ce45b1766bfecdf841ecd3c Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Wed, 3 Feb 2016 17:18:54 -0500 Subject: 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 (cherry picked from commit fd4b99b086583bc8dc91950393ffed646f7eee59) --- ci/merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit 1.2.3-korg