diff options
author | Charlie Denton <charlie@meshy.co.uk> | 2014-07-16 12:58:37 +0100 |
---|---|---|
committer | Charlie Denton <charlie@meshy.co.uk> | 2014-07-16 12:58:37 +0100 |
commit | 624e04459d3282141385ff1a67f1c4673cd11f8f (patch) | |
tree | 31bb7d54c9af41141be73909231232db4897677d | |
parent | 2fc167fca9dccc2d56daf4debdbb0537f00dd38d (diff) | |
parent | f9ce54704305bae5896f80130034ebaf2f363a7c (diff) | |
download | django-wkhtmltopdf-624e04459d3282141385ff1a67f1c4673cd11f8f.tar.gz django-wkhtmltopdf-624e04459d3282141385ff1a67f1c4673cd11f8f.tar.bz2 django-wkhtmltopdf-624e04459d3282141385ff1a67f1c4673cd11f8f.zip |
Merge pull request #58 from incuna/fix-failing-tests
Fix failing tests
-rw-r--r-- | .travis.yml | 12 | ||||
-rw-r--r-- | README.rst | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 3f3dacc..698a5ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,12 +19,12 @@ before_install: - "echo '## Installing dependencies'" - "sudo apt-get update" - "sudo apt-get install -y openssl build-essential xorg libssl-dev" - - "echo '## Downloading wkhtmltopdf 0.12.0'" - - "wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.0/wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz" - - "mkdir -p $PWD" - - "echo '## Extracting wkhtmltox into $PWD'" - - "tar xvJf wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz -C $PWD" - - "export WKHTMLTOPDF_CMD=$PWD/wkhtmltox/bin/wkhtmltopdf" + - "echo '## Downloading wkhtmltopdf 0.12.1'" + - "wget http://freefr.dl.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1_linux-precise-amd64.deb" + - "echo '## Installing wkhtmltox'" + - "sudo dpkg -i wkhtmltox-0.12.1_linux-precise-amd64.deb" + - WHICH_WK=`which wkhtmltopdf` + - "export WKHTMLTOPDF_CMD=$WHICH_WK" install: - pip install $DJANGO - pip install -r test_requirements.txt @@ -5,7 +5,7 @@ django-wkhtmltopdf :target: http://badge.fury.io/py/django-wkhtmltopdf :alt: Latest version -.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png +.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png?branch=master :target: https://travis-ci.org/incuna/django-wkhtmltopdf :alt: Travis-CI |