Skip to content

Commit

Permalink
Pin version of setuptools
Browse files Browse the repository at this point in the history
Forces explicit version of setuptools to be used because
of an upstream change:
pypa/setuptools#937

Change-Id: I4124dedee38713ca1bfa445944d8d79cf1be6c15
JIRA: STORPERF-102
Signed-off-by: mbeierl <mark.beierl@dell.com>
  • Loading branch information
mbeierl committed Jan 26, 2017
1 parent 3d41a65 commit 3edd04b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ci/verify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi
virtualenv $WORKSPACE/storperf_venv
source $WORKSPACE/storperf_venv/bin/activate

pip install setuptools
pip install --upgrade setuptools==33.1.1
pip install autoflake==0.6.6
pip install autopep8==1.2.2
pip install coverage==4.1
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ RUN puppet module install gdsoperations-graphite

RUN chmod 600 ${repos_dir}/storperf/storperf/resources/ssh/storperf_rsa

RUN pip install --upgrade setuptools==33.1.1
RUN pip install -r ${repos_dir}/storperf/docker/requirements.pip

COPY storperf.pp /etc/puppet/manifests/storperf.pp
Expand Down

0 comments on commit 3edd04b

Please sign in to comment.