diff options
| author | Marcel Hellkamp <marc@gsites.de> | 2015-10-24 20:17:07 +0200 |
|---|---|---|
| committer | Marcel Hellkamp <marc@gsites.de> | 2015-10-24 20:17:25 +0200 |
| commit | 8542700825b5151fa6604711c80f612adebd793c (patch) | |
| tree | 4cf5561d670744c8242e99bff6b0adf35314457d | |
| parent | a02b8f97fdca3d0e466d1fad87eb7fcbd3336a3d (diff) | |
| download | bottle-8542700825b5151fa6604711c80f612adebd793c.tar.gz | |
Fixed test setup for 0.12 branch.
| -rw-r--r-- | test/build_python.sh | 16 | ||||
| -rwxr-xr-x | test/travis_setup.sh | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/test/build_python.sh b/test/build_python.sh index f34110c..04baa2f 100644 --- a/test/build_python.sh +++ b/test/build_python.sh @@ -36,21 +36,19 @@ pushd $PREFIX || exit 1 echo "Running make && make install ..." (make -j8 && make install) || exit 1 - - echo "Installing distribute and pip..." hash -r - wget -N -O $PREFIX/distribute_setup.py \ - http://python-distribute.org/distribute_setup.py || exit 1 - - $PREFIX/bin/python$VERSION $PREFIX/distribute_setup.py || exit 1 + if [ $VERSION = "2.5" ]; then - $PREFIX/bin/easy_install-$VERSION simplejson || exit 1 + wget https://pypi.python.org/packages/source/s/simplejson/simplejson-3.6.3.tar.gz + tar -xvzf simplejson-3.6.3.tar.gz + cd simplejson-3.6.3 + $PREFIX/bin/python$VERSION setup.py install fi - + popd echo "Cleaning up..." - rm -rf $VERSION.tar.gz distribute_setup.py cpython-$VERSION + rm -rf $VERSION.tar.gz cpython-$VERSION popd diff --git a/test/travis_setup.sh b/test/travis_setup.sh index fbee1d9..006e294 100755 --- a/test/travis_setup.sh +++ b/test/travis_setup.sh @@ -10,7 +10,9 @@ if test -n "$PY"; then sudo apt-get install python$PY-dev if test "$PY" = 2.5; then - wget -O - http://python-distribute.org/distribute_setup.py | sudo python$PY - sudo easy_install-$PY simplejson + wget https://pypi.python.org/packages/source/s/simplejson/simplejson-3.6.3.tar.gz + tar -xvzf simplejson-3.6.3.tar.gz + cd simplejson-3.6.3 + sudo python$PY setup.py install fi fi |