From 45700c7e1ceb764de80435b0981a8bf4f484a135 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Mon, 7 May 2012 08:35:36 +0200
Subject: [PATCH] Moved CI to Travis.

---
 .travis.yml              | 16 ++++++++++
 README.rst               |  2 ++
 requirements/default.txt |  3 ++
 tox.ini                  | 64 ----------------------------------------
 4 files changed, 21 insertions(+), 64 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 requirements/default.txt
 delete mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..cb99b0f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: python
+python:
+#  - "2.5"
+  - "2.6"
+  - "2.7"
+install:
+  - pip install -q -r requirements/default.txt Django==$DJANGO --use-mirrors
+script:
+  - django-admin.py jenkins
+branches:
+  only:
+    - develop
+env:
+  - DJANGO=1.2.7
+  - DJANGO=1.3.1
+  - DJANGO=1.4
diff --git a/README.rst b/README.rst
index 3dd74ec..806c678 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,8 @@
 django-dbtemplates
 ==================
 
+.. image:: https://secure.travis-ci.org/jezdez/django-dbtemplates.png?branch=develop
+
 ``dbtemplates`` is a Django app that consists of two parts:
 
 1. It allows you to store templates in your database
diff --git a/requirements/default.txt b/requirements/default.txt
new file mode 100644
index 0000000..bb4b708
--- /dev/null
+++ b/requirements/default.txt
@@ -0,0 +1,3 @@
+pep8
+pyflakes
+django-jenkins
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 570b4f1..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,64 +0,0 @@
-[testenv]
-downloadcache = {toxworkdir}/_download/
-setenv =
-    DJANGO_SETTINGS_MODULE = dbtemplates.test_settings
-commands =
-    {envbindir}/python {envbindir}/django-admin.py jenkins {posargs:dbtemplates}
-
-[testenv:docs]
-basepython = python2.7
-deps =
-    Sphinx==1.0.7
-    Django==1.3.1
-commands =
-    rm -rf docs/_build
-    {envbindir}/sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
-
-[testenv:py25-1.2.X]
-basepython = python2.5
-deps =
-    django==1.2.5
-    pep8
-    pyflakes
-    django-jenkins
-
-[testenv:py26-1.2.X]
-basepython = python2.6
-deps =
-    django==1.2.5
-    pep8
-    pyflakes
-    django-jenkins
-
-[testenv:py27-1.2.X]
-basepython = python2.7
-deps =
-    django==1.2.5
-    pep8
-    pyflakes
-    django-jenkins
-
-
-[testenv:py25]
-basepython = python2.5
-deps =
-    django==1.3
-    pep8
-    pyflakes
-    django-jenkins
-
-[testenv:py26]
-basepython = python2.6
-deps =
-    django==1.3
-    pep8
-    pyflakes
-    django-jenkins
-
-[testenv:py27]
-basepython = python2.7
-deps =
-    django==1.3
-    pep8
-    pyflakes
-    django-jenkins