Switch from PIL to Pillow, remove workarounds.

This commit is contained in:
Tobias Gruetzmacher 2015-04-20 22:46:12 +02:00
parent ff21df596b
commit 78414cb3d7
3 changed files with 6 additions and 15 deletions

View file

@ -2,24 +2,21 @@ language: python
python: python:
- "2.7" - "2.7"
- "3.3" - "3.3"
- "3.4"
# whitelist # whitelist
branches: branches:
only: only:
- master - master
# install libjpeg-dev for PIL to handle JPEGs # install libjpeg-dev for Pillow to handle JPEGs
before_install: before_install:
- sudo apt-get update -q -y - sudo apt-get update -q -y
- sudo apt-get install -q -y libjpeg-dev - 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 # disabled upgrade: it gives build errors
# - sudo apt-get upgrade -q -y # - sudo apt-get upgrade -q -y
# command to install dependencies # command to install dependencies
install: install:
- pip install -r requirements.txt --use-mirrors - pip install -r requirements.txt
- scripts/install_pil.sh - pip install pytest-xdist
- pip install pytest-xdist --use-mirrors
# command to run tests # command to run tests
script: make test PYTESTOPTS="--tb=short -n10" script: make test PYTESTOPTS="--tb=short -n10"
#notifications: #notifications:

View file

@ -3,3 +3,5 @@ requests
# optional: # optional:
argcomplete argcomplete
lxml lxml
cssselect
Pillow

View file

@ -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