diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-08-17 14:46:16 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-08-17 21:00:03 +0200 |
| commit | 3cf63b81298f3070d83ad68b5e1c8d6794c2fb6b (patch) | |
| tree | 4aca8bd3173a65dd7612acd2254f9414e9b4b81b /testsuite | |
| parent | be87e6bce64d68346b834d7c5daccce12dcda7a1 (diff) | |
| download | bcfg2-3cf63b81298f3070d83ad68b5e1c8d6794c2fb6b.tar.gz bcfg2-3cf63b81298f3070d83ad68b5e1c8d6794c2fb6b.tar.bz2 bcfg2-3cf63b81298f3070d83ad68b5e1c8d6794c2fb6b.zip | |
travis-ci: Use django1.6 for python2.6.
Python2.6 support was dropped in django-1.7.
Diffstat (limited to 'testsuite')
| -rwxr-xr-x | testsuite/install.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh index fc08ac70c..9769d22ea 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -16,13 +16,16 @@ fi if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev libssl-dev - pip install PyYAML pyinotify boto pylibacl django Jinja2 mercurial guppy + pip install PyYAML pyinotify boto pylibacl Jinja2 mercurial guppy 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' - pip install m2crypto + pip install cheetah m2crypto + + if [[ $PYVER != "2.7" ]]; then + pip install 'django<1.7' 'South<0.8' + else + pip install django + fi fi fi |