From 78414cb3d75501346c25c6b38b599f9c040f2913 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Mon, 20 Apr 2015 22:46:12 +0200 Subject: [PATCH] Switch from PIL to Pillow, remove workarounds. --- .travis.yml | 11 ++++------- requirements.txt | 2 ++ scripts/install_pil.sh | 8 -------- 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100755 scripts/install_pil.sh diff --git a/.travis.yml b/.travis.yml index 772af5c52..f265e5259 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,24 +2,21 @@ language: python python: - "2.7" - "3.3" + - "3.4" # whitelist branches: only: - master -# install libjpeg-dev for PIL to handle JPEGs +# install libjpeg-dev for Pillow to handle JPEGs before_install: - sudo apt-get update -q -y - sudo apt-get install -q -y libjpeg-dev - - sudo ln -s /usr/lib/x86_64-linux-gnu/libjpeg.so /usr/lib - - sudo ln -s /usr/lib/x86_64-linux-gnu/libfreetype.so /usr/lib - - sudo ln -s /usr/lib/x86_64-linux-gnu/libz.so /usr/lib # disabled upgrade: it gives build errors # - sudo apt-get upgrade -q -y # command to install dependencies install: - - pip install -r requirements.txt --use-mirrors - - scripts/install_pil.sh - - pip install pytest-xdist --use-mirrors + - pip install -r requirements.txt + - pip install pytest-xdist # command to run tests script: make test PYTESTOPTS="--tb=short -n10" #notifications: diff --git a/requirements.txt b/requirements.txt index d43beb4bd..b86af7c1b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,5 @@ requests # optional: argcomplete lxml +cssselect +Pillow diff --git a/scripts/install_pil.sh b/scripts/install_pil.sh deleted file mode 100755 index ccd55f619..000000000 --- a/scripts/install_pil.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# Install PIL in Travis CI environment for Python 2.x builds. -set -e -set -u - -if python -c 'import sys; sys.exit(0 if sys.hexversion<0x03000000 else 1)'; then - pip install --allow-external PIL --allow-unverified PIL PIL -fi