diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-28 09:20:12 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-28 09:20:12 -0400 |
| commit | 99c5e5ca3f834bd1d42b280eb03c73cfcf7c52d8 (patch) | |
| tree | 5468ffd8e07b500c6b6732c853e7f23840a76181 /testsuite/install.sh | |
| parent | 48934ccb7f7bec3151c1aa24cb5bf495836e5b89 (diff) | |
| parent | 1d27fdadac37eb95d56f98cf7bdd1721a339df81 (diff) | |
| download | bcfg2-99c5e5ca3f834bd1d42b280eb03c73cfcf7c52d8.tar.gz bcfg2-99c5e5ca3f834bd1d42b280eb03c73cfcf7c52d8.tar.bz2 bcfg2-99c5e5ca3f834bd1d42b280eb03c73cfcf7c52d8.zip | |
Merge branch 'maint'
Conflicts:
doc/development/lint.txt
misc/bcfg2.spec
src/lib/Bcfg2/Reporting/Collector.py
src/lib/Bcfg2/Server/Core.py
src/lib/Bcfg2/Server/Plugins/Metadata.py
src/lib/Bcfg2/Server/models.py
testsuite/install.sh
Diffstat (limited to 'testsuite/install.sh')
| -rwxr-xr-x | testsuite/install.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh index 6895034d5..8721c8015 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -11,15 +11,17 @@ if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" ]]; then fi if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then - pip install --use-mirrors PyYAML pyinotify + pip install --use-mirrors 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 # in bcfg2 require South - pip install cheetah 'django<1.5' 'South<0.8' M2Crypto + pip install cheetah 'South<0.8' M2Crypto fi else # python < 2.6 requires M2Crypto for SSL communication, not just |