diff options
Diffstat (limited to 'testsuite/install.sh')
-rwxr-xr-x | testsuite/install.sh | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh index 8721c8015..50b91a4d2 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -ex # install script for Travis-CI @@ -11,22 +11,12 @@ if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" ]]; then fi if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then - pip install --use-mirrors PyYAML pyinotify boto - if [[ $PYVER == "2.5" ]]; then - # markdown 2.2+ doesn't work on py2.5 - pip install --use-mirrors simplejson 'markdown<2.2' 'django<1.4.9' - else - pip install 'django<1.5' - fi + pip install --use-mirrors PyYAML pyinotify boto pylibacl 'django<1.5' + easy_install https://fedorahosted.org/released/python-augeas/python-augeas-0.4.1.tar.gz if [[ ${PYVER:0:1} == "2" ]]; then # django supports py3k, but South doesn't, and the django bits # in bcfg2 require South - pip install cheetah 'South<0.8' M2Crypto - fi -else - # python < 2.6 requires M2Crypto for SSL communication, not just - # for encryption support - if [[ $PYVER == "2.5" || $PYVER == "2.4" ]]; then - pip install --use-mirrors M2crypto + pip install cheetah 'South<0.8' + pip install m2crypto fi fi |