From 720a1738facdda36815e6659a9117a4c96e603e9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 26 Oct 2019 09:58:47 +1100 Subject: [PATCH] Replaced macOS Command Line Tools install with miniconda path --- .github/workflows/macos-install.sh | 2 -- .travis/build.sh | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index 473a1695e..78eac6162 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -2,8 +2,6 @@ set -e -sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg -target / - brew install libtiff libjpeg webp little-cms2 PYTHONOPTIMIZE=0 pip install cffi diff --git a/.travis/build.sh b/.travis/build.sh index 3b286076f..a2e3041bd 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -3,5 +3,8 @@ set -e coverage erase +if [ $(uname) == "Darwin" ]; then + export CPPFLAGS="-I/usr/local/miniconda/include"; +fi make clean make install-coverage