From f00183115d69d52ef98d589469ec8c6af2f494e4 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Fri, 11 May 2018 02:11:55 -0700 Subject: [PATCH] Update our dependencies --- .travis.yml | 15 +++++++++++++++ .travis/Brewfile | 2 ++ .travis/linux_before_install.sh | 11 ----------- setup.py | 1 + 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ba7ba3d..8562c9dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,21 @@ cache: directories: - $HOME/Library/Caches/Homebrew +addons: + apt: + update: true + sources: + - sourceline: 'ppa:vshn/ghostscript' + - sourceline: 'ppa:heyarje/libav-11' + packages: + - ghostscript + - poppler-utils + - libavformat56 + - libavcodec56 + - libavutil54 + - libffi-dev + - pngquant + env: global: - secure: "hsf6MT+n2x3OiDM2fQyJZdV0/PWYmv81LdVqC6cfnHBE/8N3DloJRqQ7WfO14TxhiK9PEC7MpyCj0lSabUHEO7gSH6Vks6I1asoSkt8S9/bSMlhT4hei+pwVpeGEiU5xHVATNjY+D919VC3IFvc3XmjT74h/2SLhaZ+jhEmDggM=" # HOMEBREW_OCRMYPDF_TOKEN diff --git a/.travis/Brewfile b/.travis/Brewfile index c4fec531..b9699264 100644 --- a/.travis/Brewfile +++ b/.travis/Brewfile @@ -2,12 +2,14 @@ brew 'python' brew 'ghostscript' brew 'jbig2dec' +brew 'jbig2enc' brew 'leptonica' brew 'libffi' brew 'libtiff' brew 'libxml2' brew 'mupdf-tools' brew 'openjpeg' +brew 'pngquant' brew 'qpdf' brew 'tesseract' brew 'unpaper' diff --git a/.travis/linux_before_install.sh b/.travis/linux_before_install.sh index a4ff1622..ecb27f59 100644 --- a/.travis/linux_before_install.sh +++ b/.travis/linux_before_install.sh @@ -3,17 +3,6 @@ set -euo pipefail set -x -sudo add-apt-repository ppa:vshn/ghostscript -y -sudo add-apt-repository ppa:heyarje/libav-11 -y -sudo apt-get update -qq -sudo apt-get install -y \ - ghostscript \ - poppler-utils \ - libavformat56 \ - libavcodec56 \ - libavutil54 \ - libffi-dev - sudo add-apt-repository ppa:alex-p/tesseract-ocr -y sudo apt-get update diff --git a/setup.py b/setup.py index ccb85522..360e4c6a 100644 --- a/setup.py +++ b/setup.py @@ -243,6 +243,7 @@ setup( 'cffi >= 1.9.1', # must be a setup and install requirement 'defusedxml >= 0.5.0', # pure Python, so track HEAD closely 'img2pdf >= 0.2.4', # pure Python, so track HEAD closely + 'pikepdf', 'Pillow >= 4.0.0, != 5.1.0 ; sys_platform == "darwin"', # Pillow < 4 has BytesIO/TIFF bug w/img2pdf 0.2.3 # block 5.1.0, broken wheels