diff options
| -rw-r--r-- | .travis.yml | 32 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 21 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 6a6d5ea..01107e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,35 @@ language: python +matrix: + allow_failures: + - env: TOX_ENV=py34 + include: + - python: "2.7" + env: TOX_ENV=py27 + - python: "3.4" + env: TOX_ENV=py34 + - python: "2.7" + env: TOX_ENV=coverage + +cache: pip +sudo: false virtualenv: system_site_packages: true +addons: + apt: + packages: + - python-lxml + - python-psycopg2 + env: global: - HOST_NAME: 'travis-ci' - SECRET_KEY: 'SECRET_KEY' - matrix: - - TOX_ENV=py27 - - TOX_ENV=py34 - - TOX_ENV=coverage - -matrix: - allow_failures: - - env: TOX_ENV=py34 services: - redis-server -before_install: - - sudo add-apt-repository ppa:chris-lea/python-pil -y - - sudo apt-get update -q - - sudo apt-get install -qq python-lxml python-psycopg2 python-pil - install: - pip install tox==1.9.2 @@ -7,6 +7,7 @@ commands = paver test deps = + funcsigs pillow -rrequirements-test.txt @@ -16,5 +17,6 @@ commands = coveralls deps = + funcsigs pillow -rrequirements-test.txt |