summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-10-28 09:11:36 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-10-28 09:11:36 -0400
commit1d27fdadac37eb95d56f98cf7bdd1721a339df81 (patch)
treedcf3625ccf16be5cc739d30d8c711adc3e76ef90 /testsuite
parente4d4e60fcd671b421087f62ba442c84873ab8bda (diff)
downloadbcfg2-1d27fdadac37eb95d56f98cf7bdd1721a339df81.tar.gz
bcfg2-1d27fdadac37eb95d56f98cf7bdd1721a339df81.tar.bz2
bcfg2-1d27fdadac37eb95d56f98cf7bdd1721a339df81.zip
testsuite: install django 1.4.8 when testing py 2.5
Diffstat (limited to 'testsuite')
-rwxr-xr-xtestsuite/install.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh
index c4a1bb192..8eecd71d7 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -10,7 +10,9 @@ if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
pip install --use-mirrors genshi 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'
+ pip install --use-mirrors simplejson 'markdown<2.2' 'django<1.4.9'
+ else
+ pip install 'django<1.5'
fi
if [[ ${PYVER:0:1} == "2" ]]; then
# django supports py3k, but South doesn't, and the django bits