diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-08-17 02:44:36 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-08-17 02:44:36 +0200 |
| commit | b2fd02ad81f49cbd837afb589b140238fd028ff1 (patch) | |
| tree | b09bfaaafc93381f69743451ddf43522cfdf705c | |
| parent | a25d871158f49b9b5b86303058de24c763dc2590 (diff) | |
| download | bcfg2-b2fd02ad81f49cbd837afb589b140238fd028ff1.tar.gz bcfg2-b2fd02ad81f49cbd837afb589b140238fd028ff1.tar.bz2 bcfg2-b2fd02ad81f49cbd837afb589b140238fd028ff1.zip | |
travis-ci: Fix installation of dependencies
This is just a quick fix: The new version of pip on travis does
fail when using the --use-mirrors option (to be fair, the option
was deprecated long time ago).
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | testsuite/install.sh | 4 |
2 files changed, 3 insertions, 3 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..c8087d3cc 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -10,13 +10,13 @@ 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' \ + pip install PyYAML pyinotify boto pylibacl 'django<1.5' \ Jinja2 mercurial guppy easy_install https://fedorahosted.org/released/python-augeas/python-augeas-0.4.1.tar.gz if [[ ${PYVER:0:1} == "2" ]]; then |