Removed vestigal references to .cache.bundle.

Change-Id: I939119b9f1aaf71eb506c9596fc6f6bb8dff3137
This commit is contained in:
Monty Taylor 2012-06-13 12:21:25 -04:00
parent bf7a3fcf24
commit 4f1450b9be
4 changed files with 4 additions and 42 deletions

View File

@ -53,30 +53,7 @@ snapshotversion=$(find_next_version)
rm -f dist/*.tar.gz
if [ -f setup.py ] ; then
# Try tox and cached bundles first
if [ -e ".cache.bundle" ] ; then
if [ -f tox.ini ] ; then
if tox --showconfig | grep testenv | grep jenkinsvenv >/dev/null 2>&1
then
tox -ejenkinsvenv python setup.py sdist
else
tox -evenv python setup.py sdist
fi
else
rm -rf .venv
mv .cache.bundle .cache.pybundle
virtualenv --no-site-packages .venv
.venv/bin/pip install .cache.pybundle
rm .cache.pybundle
tools/with_venv.sh python setup.py sdist
fi
# Try old style venv's second
elif [ -d .venv -a -f tools/with_venv.sh ] ; then
tools/with_venv.sh python setup.py sdist
# Last but not least, just make a tarball
else
python setup.py sdist
fi
tox -evenv python setup.py sdist
# There should only be one, so this should be safe.
tarball=$(echo dist/*.tar.gz)

View File

@ -7,12 +7,7 @@
# what packages we ended up testing.
#
if [ -f .cache.bundle ]
then
venv=jenkinscover
else
venv=cover
fi
venv=cover
tox -e$venv
result=$?

View File

@ -7,12 +7,7 @@
# what packages we ended up testing.
#
if [ -f .cache.bundle ]
then
venv=jenkinsvenv
else
venv=venv
fi
venv=venv
mkdir -p doc/build
export HUDSON_PUBLISH_DOCS=1

View File

@ -20,12 +20,7 @@ then
exit 1
fi
if [ -f .cache.bundle ]
then
venv=jenkins$version
else
venv=py$version
fi
venv=py$version
export NOSE_WITH_XUNIT=1