diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-25 16:22:58 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-25 16:22:58 -0400 |
| commit | a02800b75bf6d6279260c1be3b6b4ab8929bd431 (patch) | |
| tree | 8c648307be3c0ccff284617c4ec7bf733158c784 /testsuite | |
| parent | 9c603d8267c0a511968a8a553d7fa0b2d5bf9b73 (diff) | |
| download | bcfg2-a02800b75bf6d6279260c1be3b6b4ab8929bd431.tar.gz bcfg2-a02800b75bf6d6279260c1be3b6b4ab8929bd431.tar.bz2 bcfg2-a02800b75bf6d6279260c1be3b6b4ab8929bd431.zip | |
travis-ci: start running py3k tests with some optional deps
Diffstat (limited to 'testsuite')
| -rwxr-xr-x | testsuite/before_install.sh | 9 | ||||
| -rwxr-xr-x | testsuite/install.sh | 8 | ||||
| -rw-r--r-- | testsuite/requirements.txt | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/testsuite/before_install.sh b/testsuite/before_install.sh index 884971e45..5f1a59aaf 100755 --- a/testsuite/before_install.sh +++ b/testsuite/before_install.sh @@ -2,9 +2,12 @@ # before_install script for Travis-CI +PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))') + sudo apt-get update -qq -sudo apt-get install -qq swig pylint libxml2-utils +sudo apt-get install -qq swig libxml2-utils if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then - sudo apt-get install -qq python-selinux python-pylibacl python-pyinotify \ - python-yaml yum + if [[ ${PYVER:0:1} == "2" ]]; then + sudo apt-get install -qq python-selinux python-pylibacl yum + fi fi diff --git a/testsuite/install.sh b/testsuite/install.sh index c1685f831..535e594b5 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -7,12 +7,14 @@ 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 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' pip install --use-mirrors simplejson + 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 South M2Crypto fi - pip install --use-mirrors genshi cheetah 'django<1.4' South M2Crypto else # python < 2.6 requires M2Crypto for SSL communication, not just # for encryption support diff --git a/testsuite/requirements.txt b/testsuite/requirements.txt index 8529b247f..c59810a99 100644 --- a/testsuite/requirements.txt +++ b/testsuite/requirements.txt @@ -3,3 +3,5 @@ nose mock sphinx daemon +pylint +pep8 |