From 2b963e8effae08a1286998ec965096096b3d8a12 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Sat, 16 Jan 2016 15:52:19 +0100 Subject: [PATCH] Changed cram installation on travis builds for python 3 --- .travis.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d08ffd..4f2e205 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,21 @@ language: c sudo: false +addons: + apt: + sources: + - deadsnakes + packages: + - python3.5 + _anchors: - &gcc49-packages apt: sources: - ubuntu-toolchain-r-test + - deadsnakes packages: + - python3.5 - gcc-4.9 - g++-4.9 - gobjc-4.9 @@ -84,15 +93,24 @@ matrix: - compiler: gcc before_install: + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi - | if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$CC" = "clang" ]; then - brew update brew unlink cmake brew install llvm cmake fi - | if [ "${TESTS:-ON}" = "ON" ]; then - pip install --user cram + if [ "$TRAVIS_OS_NAME" = "osx" ]; then + brew install python3 + export PATH="$(python3 -m site --user-base)/bin:$PATH" + else + curl -L https://bootstrap.pypa.io/get-pip.py | python3.5 - --user + fi + + pip3 install --user cram + + cram --version fi - export CXX=${CC/gcc/g++}; export CXX=${CXX/clang/clang++} - $CC --version