summaryrefslogtreecommitdiffstats
path: root/testsuite/install.sh
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 15:15:43 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 15:15:43 -0400
commit2b898c094a88f99e987f48a7d116d4a6009b456c (patch)
tree8ed5419373109592dc05398f41e1f8af79b71dd2 /testsuite/install.sh
parenta899adb987e3bdce30d7241ad0dc1ff77606f4b9 (diff)
downloadbcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.tar.gz
bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.tar.bz2
bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.zip
tweaked tests for python 2.5
Diffstat (limited to 'testsuite/install.sh')
-rwxr-xr-xtestsuite/install.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh
index 4d25c830c..565e158df 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -4,12 +4,17 @@
pip install -r testsuite/requirements.txt --use-mirrors
+PYVER=$(python -c 'import sys;print ".".join(str(v) for v in sys.version_info[0:2])')
+
if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
+ if [[ $PYVER == "2.5" ]]; then
+ # markdown 2.2.0 is broken on py2.5, so until 2.2.1 is released use 2.1
+ pip install --use-mirrors 'markdown<2.2'
+ fi
pip install --use-mirrors genshi cheetah 'django<1.4' M2Crypto
else
# python < 2.6 requires M2Crypto for SSL communication, not just
# for encryption support
- PYVER=$(python -c 'import sys;print ".".join(str(v) for v in sys.version_info[0:2])')
if [[ $PYVER == "2.5" || $PYVER == "2.4" ]]; then
pip install --use-mirrors M2crypto
fi