From 1bdbffbcb2037e1497ac400616a4668e0ea6c23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 12 Mar 2018 09:43:14 +0100 Subject: [PATCH] CI: Use Python 3 for future migration to Hunter 0.20 --- .travis.yml | 7 +++++-- CMakeLists.txt | 2 +- appveyor.yml | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 105aa65d74..a1c346977b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ branches: - master - ci - travis + - hunter - /^release.*$/ matrix: include: @@ -27,9 +28,11 @@ before_install: | fi if [ "$TRAVIS_OS_NAME" = linux ]; then scripts/install_cmake.sh - sudo pip install --upgrade requests pyopenssl + pyenv local 3.6 + pip install --user requests elif [ "$TRAVIS_OS_NAME" == "osx" ]; then - sudo pip install requests + HOMEBREW_NO_AUTO_UPDATE=1 brew install -q python3 + pip3 install -q requests fi script: - cmake -DHUNTER_JOBS_NUMBER=4 -DETHASHCUDA=$CUDA -DETHASHCL=ON -DAPICORE=ON -H. -Bbuild diff --git a/CMakeLists.txt b/CMakeLists.txt index 244e4fb3cb..ddeb69c462 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ HunterGate( ) if(HUNTER_ENABLED) - find_package(PythonInterp) + find_package(PythonInterp 3) if(PYTHONINTERP_FOUND) hunter_gate_self( "${HUNTER_CACHED_ROOT}" diff --git a/appveyor.yml b/appveyor.yml index c61324c14a..83674b0264 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,6 +20,7 @@ install: | # Download CUDA Windows installer (local) and extract /compiler/* to 7z x CUDA-v9.0-WindowsServer2012.zip -oC:/ set PATH=%PATH%;C:/CUDA/v9.0/bin nvcc -V + set PATH=C:\Python36-x64;C:\Python36-x64\Scripts;%PATH% pip install requests before_build: - cmake -G "Visual Studio 14 2015 Win64" -H. -Bbuild -DETHASHCUDA=ON -DAPICORE=ON