diff --git a/.travis.yml b/.travis.yml index 6fbcd951..0bfa9ff6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,9 @@ before_install: | if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash .travis/linux_before_install.sh elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - bash .travis/osx_before_install.sh + brew update && brew bundle --file=.travis/Brewfile + pip3 install --upgrade pip + pip3 install wheel fi install: diff --git a/.travis/Brewfile b/.travis/Brewfile new file mode 100644 index 00000000..66a3ba2b --- /dev/null +++ b/.travis/Brewfile @@ -0,0 +1,12 @@ +brew 'python' + +brew 'ghostscript' +brew 'jbig2dec' +brew 'leptonica' +brew 'libffi' +brew 'libtiff' +brew 'libxml2' +brew 'openjpeg' +brew 'qpdf' +brew 'tesseract' +brew 'unpaper' diff --git a/.travis/autobrew.py b/.travis/autobrew.py index 613de199..6cc98a65 100644 --- a/.travis/autobrew.py +++ b/.travis/autobrew.py @@ -19,7 +19,7 @@ class Ocrmypdf < Formula depends_on "ghostscript" depends_on "jpeg" depends_on "libpng" - depends_on "python3" + depends_on "python" depends_on "qpdf" depends_on "tesseract" depends_on "unpaper" diff --git a/.travis/osx_before_install.sh b/.travis/osx_before_install.sh deleted file mode 100644 index 91ad0276..00000000 --- a/.travis/osx_before_install.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# © 2017 James R. Barlow: github.com/jbarlow83 -set -euo pipefail -set -x - -brew update - -brew install openjpeg jbig2dec libtiff # image libraries -brew install qpdf -brew install ghostscript -brew install python3 -brew install libxml2 libffi leptonica -brew install unpaper # optional -brew install tesseract - -pip3 install --upgrade pip -pip3 install wheel