From e5754e77af98076b6483139370f536272db8efdd Mon Sep 17 00:00:00 2001 From: mattack108 Date: Tue, 15 Jan 2013 16:30:26 +0000 Subject: Add requirements.txt and travis.yml files for Travis CI service --- .travis.yml | 9 +++++++++ requirements.txt | 1 + 2 files changed, 10 insertions(+) create mode 100644 .travis.yml create mode 100644 requirements.txt diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..87ff52d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: python +python: + - 2.7 +script: make test +notifications: + email: false +install: + - pip install -r requirements.txt + - export DEBUG=True diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..3999bef --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +Django==1.4.2 -- cgit v1.2.3 From 794768b6eb3d8b80108e4e2b491f9ff8d36763d6 Mon Sep 17 00:00:00 2001 From: mattack108 Date: Tue, 15 Jan 2013 16:44:19 +0000 Subject: Move requirements file to test project, update travis.yml --- .travis.yml | 5 +++-- requirements.txt | 1 - wkhtmltopdf/tests/test_requirements.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 requirements.txt create mode 100644 wkhtmltopdf/tests/test_requirements.txt diff --git a/.travis.yml b/.travis.yml index 87ff52d..1dbd10d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: python python: + - 2.6 - 2.7 script: make test notifications: email: false install: - - pip install -r requirements.txt - - export DEBUG=True + - pip install -r wkhtmltopdf/tests/test_requirements.txt + - pip install . diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 3999bef..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -Django==1.4.2 diff --git a/wkhtmltopdf/tests/test_requirements.txt b/wkhtmltopdf/tests/test_requirements.txt new file mode 100644 index 0000000..3999bef --- /dev/null +++ b/wkhtmltopdf/tests/test_requirements.txt @@ -0,0 +1 @@ +Django==1.4.2 -- cgit v1.2.3 From 0d95feab6266e87dc71379927646b8bf148b9c7f Mon Sep 17 00:00:00 2001 From: mattack108 Date: Tue, 15 Jan 2013 16:49:12 +0000 Subject: Update README with TravisCI build status widget --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 925f543..f93878e 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,8 @@ django-wkhtmltopdf ================== +[![Build Status](https://travis-ci.org/incuna/django-wkhtmltopdf.png)](https://travis-ci.org/incuna/django-wkhtmltopdf) + Converts html to PDF -------------------- -- cgit v1.2.3 From cceabb0f893b67ff8924e7939ab1675235f88dca Mon Sep 17 00:00:00 2001 From: mattack108 Date: Tue, 15 Jan 2013 16:52:41 +0000 Subject: Use correct markdown format (yes, it is RST here ;) --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index f93878e..26cf36d 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,8 @@ django-wkhtmltopdf ================== -[![Build Status](https://travis-ci.org/incuna/django-wkhtmltopdf.png)](https://travis-ci.org/incuna/django-wkhtmltopdf) +.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png + :target: https://travis-ci.org/incuna/django-wkhtmltopdf Converts html to PDF -- cgit v1.2.3 From d4a938c08539264add40126ff5c8ab673a8f78c1 Mon Sep 17 00:00:00 2001 From: mattack108 Date: Tue, 15 Jan 2013 17:36:53 +0000 Subject: Update travis with before_script.sh which install wkhtmltopdf for Travis --- .travis.yml | 13 ++++++++----- before_script.sh | 8 ++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 before_script.sh diff --git a/.travis.yml b/.travis.yml index 1dbd10d..cb3ffca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: python python: - - 2.6 - - 2.7 -script: make test -notifications: - email: false + - "2.6" + - "2.7" +before_script: + - "./before_script.sh" install: - pip install -r wkhtmltopdf/tests/test_requirements.txt - pip install . +script: + - make test +notifications: + email: false diff --git a/before_script.sh b/before_script.sh new file mode 100644 index 0000000..ed0b6b4 --- /dev/null +++ b/before_script.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +sudo aptitude install -y openssl build-essential xorg libssl-dev +wget http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-i386.tar.bz2 +tar xvjf wkhtmltopdf-0.11.0_rc1-static-i386.tar.bz2 +sudo chown root:root wkhtmltopdf-i386 +sudo mv wkhtmltopdf-i386 /usr/bin/wkhtmltopdf +export WKHTMLTOPDF=/usr/bin/wkhtmltopdf -- cgit v1.2.3 From 28531169c5768d1a2bc810b2c9a322345e666550 Mon Sep 17 00:00:00 2001 From: mattack108 Date: Thu, 17 Jan 2013 09:54:42 +0000 Subject: Update travis.yml --- .travis.yml | 2 +- README.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb3ffca..d89a6d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "2.6" - "2.7" before_script: - - "./before_script.sh" + - before_script.sh install: - pip install -r wkhtmltopdf/tests/test_requirements.txt - pip install . diff --git a/README.rst b/README.rst index 26cf36d..579ebcd 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ django-wkhtmltopdf ================== -.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png +.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png?branch=travis-setup :target: https://travis-ci.org/incuna/django-wkhtmltopdf -- cgit v1.2.3 From 155fef5b5638fd20b76b69aa492e634ceb0316dc Mon Sep 17 00:00:00 2001 From: mattack108 Date: Thu, 17 Jan 2013 10:20:57 +0000 Subject: Change file permission --- .travis.yml | 2 +- before_script.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 before_script.sh diff --git a/.travis.yml b/.travis.yml index d89a6d7..cb3ffca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "2.6" - "2.7" before_script: - - before_script.sh + - "./before_script.sh" install: - pip install -r wkhtmltopdf/tests/test_requirements.txt - pip install . diff --git a/before_script.sh b/before_script.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From d31a7cde37bf7a9a718dba1f929b5b5e89409724 Mon Sep 17 00:00:00 2001 From: mattack108 Date: Thu, 17 Jan 2013 10:34:27 +0000 Subject: Remove url param for Travis status widget --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 579ebcd..26cf36d 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ django-wkhtmltopdf ================== -.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png?branch=travis-setup +.. image:: https://travis-ci.org/incuna/django-wkhtmltopdf.png :target: https://travis-ci.org/incuna/django-wkhtmltopdf -- cgit v1.2.3