travis-ci: Also run tests with python2.4 and python2.5

1 files changed, 24 insertions, 20 deletions

diff --git a/testsuite/install.sh b/testsuite/install.sh
index eb569ec56..13a2e9d01 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -1,31 +1,35 @@
 #!/bin/bash -ex
 
 # install script for Travis-CI
-pip install --upgrade pip
-
-pip_wheel() {
-    pip wheel --find-links="$HOME/.cache/wheels/" --wheel-dir="$HOME/.cache/wheels/" "$@"
-    pip install --no-index --find-links="$HOME/.cache/wheels/" "$@"
-}
-
-pip_wheel -r testsuite/requirements.txt
-
 PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))')
 
-if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" ]]; then
-    pip_wheel unittest2
-fi
+if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" && $PYVER != "2.6" ]]; then
+    pip install -r testsuite/requirements-legacy.txt
+else
+    pip install --upgrade pip
+
+    pip_wheel() {
+        pip wheel --find-links="$HOME/.cache/wheels/" --wheel-dir="$HOME/.cache/wheels/" "$@"
+        pip install --no-index --find-links="$HOME/.cache/wheels/" "$@"
+    }
 
-if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
-    pip_wheel PyYAML pyinotify boto pylibacl Jinja2 mercurial guppy cherrypy python-augeas
+    pip_wheel -r testsuite/requirements.txt
 
-    if [[ ${PYVER:0:1} == "2" ]]; then
-        pip_wheel cheetah m2crypto
+    if [[ $PYVER == "2.6" ]]; then
+        pip_wheel unittest2
+    fi
 
-        if [[ $PYVER != "2.7" ]]; then
-            pip_wheel 'django<1.7' 'South<0.8'
-        else
-            pip_wheel django
+    if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
+        pip_wheel PyYAML pyinotify boto pylibacl Jinja2 mercurial guppy cherrypy python-augeas
+    
+        if [[ ${PYVER:0:1} == "2" ]]; then
+            pip_wheel cheetah m2crypto
+    
+            if [[ $PYVER != "2.7" ]]; then
+                pip_wheel 'django<1.7' 'South<0.8'
+            else
+                pip_wheel django
+            fi
         fi
     fi
 fi