From ab7e5a9b1a2505bf9a11508316e1ff48a3210d8f Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 5 Jul 2013 18:23:19 -0400 Subject: [PATCH] Do not use distribute in requirements gate venv Remove the --distribute flag so that the virtualenv is created with vanilla setuptools to avoid conflicts between packages that try to update setuptools or distribute. Change-Id: I63456887027f707a6b42c86ea44e587df0f503de Signed-off-by: Doug Hellmann Reviewed-on: https://review.openstack.org/35905 Reviewed-by: Khai Do Reviewed-by: Jeremy Stanley Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- .../files/jenkins_job_builder/config/requirements.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index 481fe8b00f..202ed8ff21 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -7,7 +7,7 @@ - shell: | #!/bin/bash -xe /usr/local/jenkins/slave_scripts/select-mirror.sh openstack requirements - virtualenv --clear --distribute .venv + virtualenv --clear .venv PIP_ARGS="" REQ_FILES="tools/pip-requires tools/test-requires requirements.txt test-requirements.txt" for FILE in $REQ_FILES