From d843e33d973b550bb7b019c80f94034e0080b02a Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 11:14:37 +0100 Subject: Update .travis for Python3 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index cb3ffca..7ff9d4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: python python: - "2.6" - "2.7" + - "3.3" + - "3.4" before_script: - "./before_script.sh" install: -- cgit v1.2.3 From 61f7af8399c1ab51a0b2dff06414170947eaa228 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 11:43:43 +0100 Subject: Support moar Django The future is now ;] --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 7ff9d4e..d6bb5c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,20 @@ python: - "2.7" - "3.3" - "3.4" +env: + - DJANGO==1.4.13 + - DJANGO==1.5.8 + - DJANGO==1.6.5 +matrix: + exclude: + - python: 3.3 + env: DJANGO==1.4.13 + - python: 3.4 + env: DJANGO==1.4.13 before_script: - "./before_script.sh" install: - - pip install -r wkhtmltopdf/tests/test_requirements.txt + - pip install $DJANGO - pip install . script: - make test -- cgit v1.2.3 From fae7dc96b6bd9d174d38505b8870e38311198c12 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 11:46:22 +0100 Subject: Fix env for travis --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index d6bb5c4..8c1a717 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,15 @@ python: - "3.3" - "3.4" env: - - DJANGO==1.4.13 - - DJANGO==1.5.8 - - DJANGO==1.6.5 + - DJANGO=Django==1.4.13 + - DJANGO=Django==1.5.8 + - DJANGO=Django==1.6.5 matrix: exclude: - python: 3.3 - env: DJANGO==1.4.13 + env: DJANGO=Django==1.4.13 - python: 3.4 - env: DJANGO==1.4.13 + env: DJANGO=Django==1.4.13 before_script: - "./before_script.sh" install: -- cgit v1.2.3 From c5c66b156da1b29faaba5388785f6b2eac4f3030 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 11:52:02 +0100 Subject: yml is hard --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 8c1a717..0cbb0de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,9 @@ env: - DJANGO=Django==1.6.5 matrix: exclude: - - python: 3.3 + - python: "3.3" env: DJANGO=Django==1.4.13 - - python: 3.4 + - python: "3.4" env: DJANGO=Django==1.4.13 before_script: - "./before_script.sh" -- cgit v1.2.3 From 3898e56c1f8a4cceea21e2628fdb7d93f97ca615 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 12:27:54 +0100 Subject: Make teh tests run right Because Django 1.6 and other fireworks. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 0cbb0de..a7f43c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_script: - "./before_script.sh" install: - pip install $DJANGO + - pip install -r test_requirements.txt - pip install . script: - make test -- cgit v1.2.3 From 35f093603ecf6aa48b29d91ba4a6da1cb7109817 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 15:45:15 +0100 Subject: Move the wkhtmltopdf install process to .travis --- .travis.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to '.travis.yml') 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 -- cgit v1.2.3 From 0caa3f75d50607c9e37b7f7249b99ab9897cd023 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 15:55:11 +0100 Subject: Travis does not like before_install? --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index dab05fc..3816ee5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: env: DJANGO=Django==1.4.13 - python: "3.4" env: DJANGO=Django==1.4.13 -before_install: +install: - echo '## Installing dependencies' - sudo apt-get install -y openssl build-essential xorg libssl-dev - echo '## Downloading wkhtmltopdf 0.12.0' @@ -25,7 +25,7 @@ before_install: - 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 - pip install . -- cgit v1.2.3 From d7c17ca2f766a214dae867a1dfe0a7ac0d64837c Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 15:57:58 +0100 Subject: Double quotes for install cmds --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 3816ee5..e4f8d64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,16 +16,16 @@ matrix: env: DJANGO=Django==1.4.13 - python: "3.4" env: DJANGO=Django==1.4.13 +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: - - 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 - - pip install $DJANGO - pip install -r test_requirements.txt - pip install . -- cgit v1.2.3 From 2f999b9bde4b64271fb42e9caa30474451c4098d Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 16:00:30 +0100 Subject: Move pwd to before_install section C'mon Travis! --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e4f8d64..352b7c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ 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 @@ -17,14 +15,15 @@ matrix: - python: "3.4" env: DJANGO=Django==1.4.13 before_install: + - PWD=`pwd` - "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" + - "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" install: - pip install $DJANGO - pip install -r test_requirements.txt -- cgit v1.2.3 From 865889afb07866b6a41e93be3600c40acdacacc9 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 16:16:38 +0100 Subject: Add apt-get update for Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 352b7c6..a2b7cf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ matrix: before_install: - PWD=`pwd` - "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" -- cgit v1.2.3 From 47dc520837b5d099fecc0db27f38ee6ebf898a80 Mon Sep 17 00:00:00 2001 From: Matt Lenc Date: Wed, 18 Jun 2014 17:39:22 +0100 Subject: Range Django versions --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index a2b7cf8..3f3dacc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,15 @@ python: - "3.3" - "3.4" env: - - DJANGO=Django==1.4.13 - - DJANGO=Django==1.5.8 - - DJANGO=Django==1.6.5 + - DJANGO="Django>=1.4,<1.5" + - DJANGO="Django>=1.5,<1.6" + - DJANGO="Django>=1.6,<1.7" matrix: exclude: - python: "3.3" - env: DJANGO=Django==1.4.13 + env: DJANGO="Django>=1.4,<1.5" - python: "3.4" - env: DJANGO=Django==1.4.13 + env: DJANGO="Django>=1.4,<1.5" before_install: - PWD=`pwd` - "echo '## Installing dependencies'" -- cgit v1.2.3