diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-07-25 08:04:45 -0700 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-07-25 10:08:15 -0700 |
| commit | f858c8069cc27288fd7ddbe5963586d1809edc3a (patch) | |
| tree | 388dc1d6ef4f7a2e48e2cd8241c4e2415b45899d | |
| parent | 24c38b34c7f7c3074aef884013a1895c01fa93e6 (diff) | |
| download | pbr-f858c8069cc27288fd7ddbe5963586d1809edc3a.tar.gz | |
Stop trying to install old pip and setuptools
Now that pip 1.4 is out, setuptools<0.7 is invalid because 1.4 will not
install 'pre-release' software without being explicitly asked, and all
of the pre 0.7 setuptools releases have a letter in them. Just stop
trying to do it, because we actually don't use it anyway.
Additionally, we were trying to intsall pip 1.3 for a test but were not
installing that into the local mirror. Match them so that they're equal
and can install.
Change-Id: I61b9b810e64b40ceccb5eb0f4b2ddc4faefd8e04
| -rw-r--r-- | tools/integration.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/integration.sh b/tools/integration.sh index 1e42aff..8156f72 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -48,7 +48,7 @@ cat <<EOF > ~/.pip/pip.conf log = $HOME/pip.log EOF -mkvenv $jeepybvenv 'setuptools>=0.7' pip +mkvenv $jeepybvenv setuptools pip $jeepybvenv/bin/pip install -U git+https://review.openstack.org/p/openstack-infra/jeepyb.git cat <<EOF > $tmpdir/mirror.yaml @@ -68,7 +68,6 @@ cd $pbrsdistdir $jeepybvenv/bin/run-mirror -b remotes/origin/master --verbose -c $tmpdir/mirror.yaml --no-process $jeepybvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack 'pip==1.0' 'setuptools>=0.7' -$jeepybvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack 'setuptools<0.7' $jeepybvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack -r requirements.txt $jeepybvenv/bin/python setup.py sdist -d $tmpdownload/pip/openstack @@ -164,7 +163,7 @@ for PROJECT in $PROJECTS ; do # Test that the tarball installs cd $tmpdir tarballvenv=$tmpdir/tarball - mkvenv $tarballvenv 'setuptools>=0.7' 'pip>=1.3,<1.4' + mkvenv $tarballvenv setuptools pip $tarballvenv/bin/pip install $shortprojectdir/dist/*tar.gz # Test pip installing |