aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Lenc <mattl@incuna.com>2014-06-18 15:45:15 +0100
committerMatt Lenc <mattl@incuna.com>2014-06-18 15:45:15 +0100
commit35f093603ecf6aa48b29d91ba4a6da1cb7109817 (patch)
treeba137ab21cd1b13e2120e375e62f7e2227f5d3c7
parent6cacfe5e012a3e9b95b53dede0ba997f5ed74880 (diff)
downloaddjango-wkhtmltopdf-35f093603ecf6aa48b29d91ba4a6da1cb7109817.tar.gz
django-wkhtmltopdf-35f093603ecf6aa48b29d91ba4a6da1cb7109817.tar.bz2
django-wkhtmltopdf-35f093603ecf6aa48b29d91ba4a6da1cb7109817.zip
Move the wkhtmltopdf install process to .travis
-rw-r--r--.travis.yml13
-rwxr-xr-xbefore_script.sh12
2 files changed, 11 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index a7f43c2..dab05fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ python:
- "3.3"
- "3.4"
env:
+ global:
+ - WKHTML_HOME=`pwd`/"_wkhtmltopdf"
- DJANGO=Django==1.4.13
- DJANGO=Django==1.5.8
- DJANGO=Django==1.6.5
@@ -14,8 +16,15 @@ matrix:
env: DJANGO=Django==1.4.13
- python: "3.4"
env: DJANGO=Django==1.4.13
-before_script:
- - "./before_script.sh"
+before_install:
+ - echo '## Installing dependencies'
+ - 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 $WKHTML_HOME
+ - echo "## Extracting wkhtmltox into $WKHTML_HOME"
+ - tar xvJf wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz -C $WKHTML_HOME
+ - export WKHTMLTOPDF_CMD=$WKHTML_HOME/wkhtmltox/bin/wkhtmltopdf
install:
- pip install $DJANGO
- pip install -r test_requirements.txt
diff --git a/before_script.sh b/before_script.sh
deleted file mode 100755
index e5956b0..0000000
--- a/before_script.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-WKHTMLTOX_FOLDER="`pwd`/wkhtmltox_folder"
-
-echo '## Installing dependencies'
-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 $WKHTMLTOX_FOLDER
-echo "## Extracting wkhtmltox into $WKHTMLTOX_FOLDER"
-tar xvJf wkhtmltox-linux-amd64_0.12.0-03c001d.tar.xz -C $WKHTMLTOX_FOLDER
-export WKHTMLTOPDF_CMD=$WKHTMLTOX_FOLDER/wkhtmltox/bin/wkhtmltopdf
-$WKHTMLTOPDF_CMD --version