From b2fd02ad81f49cbd837afb589b140238fd028ff1 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Wed, 17 Aug 2016 02:44:36 +0200 Subject: 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). --- .travis.yml | 2 +- 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 -- cgit v1.2.3-1-g7c22 From 45d615a281a24d06e63e94d1ea2cdace4d5c020e Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Wed, 17 Aug 2016 14:46:16 +0200 Subject: travis-ci: Bump django dependency --- testsuite/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/install.sh b/testsuite/install.sh index c8087d3cc..fc08ac70c 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -16,9 +16,9 @@ fi if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev libssl-dev - pip install 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 -- cgit v1.2.3-1-g7c22