From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 4 Jan 2018 10:45:38 +0000 (+0100)
Subject: travis: try to fix python modules
X-Git-Tag: v2.0.0~44^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff28c1c0f70fcdfc5af95238efecf2b141a7f2d9;p=thirdparty%2Fknot-resolver.git

travis: try to fix python modules
---

diff --git a/.travis.yml b/.travis.yml
index ad7835d41..ce0bb2a4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,11 +30,11 @@ before_script:
     - BOOTSTRAP_CLEANUP=1 ./scripts/bootstrap-depends.sh ${HOME}/.local
     - rvm get stable || true
 script:
-    - CFLAGS="-O2 -g -fno-omit-frame-pointer -DDEBUG" make -j2 install check V=1 COVERAGE=1 PREFIX=${HOME}/.local DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}
+    - CFLAGS="-O2 -g -fno-omit-frame-pointer -DDEBUG" make -j2 install check V=1 PREFIX=${HOME}/.local DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}
     - ./daemon/kresd -h
     - ./daemon/kresd -V
     - echo "quit()" | ./daemon/kresd -a 127.0.0.1@53535 .
-    - CFLAGS="-O2 -g -fno-omit-frame-pointer -DDEBUG" make -j2 check-integration COVERAGE=1 PREFIX=${HOME}/.local DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}
+    - CFLAGS="-O2 -g -fno-omit-frame-pointer -DDEBUG" make -j2 check-integration PREFIX=${HOME}/.local DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}
 after_success:
     - if test $TRAVIS_OS_NAME = linux; then coveralls -i lib -i daemon -x ".c" --gcov-options '\-lp'; fi
 sudo: false
diff --git a/scripts/bootstrap-depends.sh b/scripts/bootstrap-depends.sh
index 504eccfa9..59a62e733 100755
--- a/scripts/bootstrap-depends.sh
+++ b/scripts/bootstrap-depends.sh
@@ -127,15 +127,15 @@ function pkg {
 }
 
 # travis-specific
-PIP_PKGS="dnspython==1.11 cpp-coveralls Jinja2"
 if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
 	brew update
-	for p in makedepend hiredis libmemcached protobuf-c cmocka jansson gnutls luajit libuv python3; do
+	for p in makedepend hiredis libmemcached protobuf-c cmocka jansson gnutls \
+			luajit libuv python3 libyaml augeas; do
 		echo "BEGIN $p";
 		brew install "$p" || brew upgrade "$p" # install fails on installed packages
 		echo "END $p";
 	done
-	pip3 install ${PIP_PKGS}
+	pip3 install -r "${TRAVIS_BUILD_DIR}/tests/deckard/requirements.txt"
 fi
 if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 	pip install --user --upgrade pip || true