From a039bf6624a25d5dbbdfb03cea22d03148b02d17 Mon Sep 17 00:00:00 2001 From: Oliver Tonnhofer Date: Thu, 8 Sep 2016 16:10:49 +0200 Subject: [PATCH] work around py3 incompatible boto plugin on travis travis-ci/travis-ci#5246 --- .travis.yml | 8 +++++++- requirements-tests.txt | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5b42e598..b26c87d3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,12 @@ addons: - libprotoc-dev env: - - MAPPROXY_TEST_COUCHDB=http://127.0.0.1:5984 + global: + - MAPPROXY_TEST_COUCHDB=http://127.0.0.1:5984 + + # do not load /etc/boto.cfg with Python 3 incompatible plugin + # https://github.com/travis-ci/travis-ci/issues/5246#issuecomment-166460882 + - BOTO_CONFIG=/doesnotexist cache: directories: @@ -39,5 +44,6 @@ install: # riak packages are not compatible with Python 3 - "if [[ $TRAVIS_PYTHON_VERSION = '2.7' ]]; then pip install protobuf>=2.4.1 riak==2.2 riak_pb>=2.0; export MAPPROXY_TEST_COUCHDB=http://127.0.0.1:5984; export MAPPROXY_TEST_RIAK_PBC=pbc://localhost:8087; fi" - "pip install -r requirements-tests.txt" + - "pip freeze" script: nosetests mapproxy diff --git a/requirements-tests.txt b/requirements-tests.txt index 3eed4c9b4..486009628 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -1,6 +1,6 @@ WebTest==2.0.10 lxml==3.2.4 -nose==1.3.0 +nose==1.3.7 Shapely==1.5.8 PyYAML==3.10 Pillow==2.8.1