From e707a8efc798950bb4151686766b14fccf913632 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 5 Dec 2013 14:46:13 -0500 Subject: testsuite: install (most) optional dependencies correctly for travis-ci Still can't get the python selinux libs to install --- testsuite/before_install.sh | 5 +++-- testsuite/install.sh | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'testsuite') diff --git a/testsuite/before_install.sh b/testsuite/before_install.sh index 1c781a218..2c80036cd 100755 --- a/testsuite/before_install.sh +++ b/testsuite/before_install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -ex # before_install script for Travis-CI @@ -8,6 +8,7 @@ sudo apt-get update -qq sudo apt-get install -qq swig libxml2-utils if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then if [[ ${PYVER:0:1} == "2" ]]; then - sudo apt-get install -qq python-selinux python-pylibacl yum python-augeas + sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev \ + libssl-dev fi fi diff --git a/testsuite/install.sh b/testsuite/install.sh index 574eb17ed..9de5b8c6d 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -ex # install script for Travis-CI @@ -7,10 +7,13 @@ 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 'django<1.5' + pip install --use-mirrors genshi PyYAML pyinotify boto 'django<1.5' \ + pylibacl + easy_install https://fedorahosted.org/released/python-augeas/python-augeas-0.4.1.tar.gz 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 + pip install cheetah 'South<0.8' + pip install m2crypto fi fi -- cgit v1.2.3-1-g7c22