diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2016-08-17 07:48:41 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2016-08-17 07:48:41 -0500 |
| commit | be87e6bce64d68346b834d7c5daccce12dcda7a1 (patch) | |
| tree | e6d092109b52fe081d2d4d0c32a396f1e455b716 | |
| parent | 38c15b2e8efa6e0706bfe469842b55d1c7639f73 (diff) | |
| parent | 45d615a281a24d06e63e94d1ea2cdace4d5c020e (diff) | |
| download | bcfg2-be87e6bce64d68346b834d7c5daccce12dcda7a1.tar.gz bcfg2-be87e6bce64d68346b834d7c5daccce12dcda7a1.tar.bz2 bcfg2-be87e6bce64d68346b834d7c5daccce12dcda7a1.zip | |
Merge branch 'fix/travis-ci' of https://github.com/AlexanderS/bcfg2
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | testsuite/install.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 8b336e7f8..d2be4783b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - WITH_OPTIONAL_DEPS=no install: - testsuite/install.sh - - pip install --use-mirrors -e . + - pip install -e . script: - nosetests testsuite after_failure: diff --git a/testsuite/install.sh b/testsuite/install.sh index 42d5bbadb..fc08ac70c 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -10,15 +10,15 @@ pip install -r testsuite/requirements.txt PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))') if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" ]]; then - pip install --use-mirrors unittest2 + pip install unittest2 fi if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev libssl-dev - pip install --use-mirrors PyYAML pyinotify boto pylibacl 'django<1.5' \ - Jinja2 mercurial guppy + pip install PyYAML pyinotify boto pylibacl django Jinja2 mercurial guppy 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 |