diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-25 07:54:27 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-25 07:55:48 -0500 |
| commit | a02509650edd374b60ef178d217cda7faab24141 (patch) | |
| tree | 09af9143c3d2fe98d266ea8357b39f255acc30e2 /testsuite/install.sh | |
| parent | a7c4e87f7501439a93807c119f611c8be23194eb (diff) | |
| download | bcfg2-a02509650edd374b60ef178d217cda7faab24141.tar.gz bcfg2-a02509650edd374b60ef178d217cda7faab24141.tar.bz2 bcfg2-a02509650edd374b60ef178d217cda7faab24141.zip | |
testsuite: removed py2.5 from travis tests, no longer supported
http://about.travis-ci.org/blog/2013-11-18-upcoming-build-environment-updates/
Diffstat (limited to 'testsuite/install.sh')
| -rwxr-xr-x | testsuite/install.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh index 3f066b2bc..574eb17ed 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -7,22 +7,10 @@ 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 - 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' 'django<1.4.9' - else - pip install 'django<1.5' - fi + pip install --use-mirrors genshi PyYAML pyinotify boto 'django<1.5' 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 - fi fi |