summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-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