From 2580466ffc29006fe735f1b52c5c42a753cc878b Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Tue, 3 Feb 2015 14:51:49 +0200
Subject: [PATCH] Added Cython to the build matrix.

---
 .travis.yml | 28 ++++++++++++++++++++++++++++
 tox.ini     |  7 +++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 28ebfc00f..f4f02bf70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,30 @@ env:
     - TOX_ENV=py33-djangomaster
     - TOX_ENV=py32-djangomaster
     - TOX_ENV=py27-djangomaster
+    - TOX_ENV=py34-django17-cython
+    - TOX_ENV=py33-django17-cython
+    - TOX_ENV=py32-django17-cython
+    - TOX_ENV=py27-django17-cython
+    - TOX_ENV=py34-django16-cython
+    - TOX_ENV=py33-django16-cython
+    - TOX_ENV=py32-django16-cython
+    - TOX_ENV=py27-django16-cython
+    - TOX_ENV=py26-django16-cython
+    - TOX_ENV=py34-django15-cython
+    - TOX_ENV=py33-django15-cython
+    - TOX_ENV=py32-django15-cython
+    - TOX_ENV=py27-django15-cython
+    - TOX_ENV=py26-django15-cython
+    - TOX_ENV=py27-django14-cython
+    - TOX_ENV=py26-django14-cython
+    - TOX_ENV=py34-django18alpha-cython
+    - TOX_ENV=py33-django18alpha-cython
+    - TOX_ENV=py32-django18alpha-cython
+    - TOX_ENV=py27-django18alpha-cython
+    - TOX_ENV=py34-djangomaster-cython
+    - TOX_ENV=py33-djangomaster-cython
+    - TOX_ENV=py32-djangomaster-cython
+    - TOX_ENV=py27-djangomaster-cython
 
 matrix:
   fast_finish: true
@@ -37,6 +61,10 @@ matrix:
     - env: TOX_ENV=py33-djangomaster
     - env: TOX_ENV=py32-djangomaster
     - env: TOX_ENV=py27-djangomaster
+    - env: TOX_ENV=py34-djangomaster-cython
+    - env: TOX_ENV=py33-djangomaster-cython
+    - env: TOX_ENV=py32-djangomaster-cython
+    - env: TOX_ENV=py27-djangomaster-cython
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 8e0369643..89f600b28 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,11 @@
 [tox]
 envlist =
        py27-{flake8,docs},
-       {py26,py27}-django14,
+       {py26,py27}-django14-cython,
        {py26,py27,py32,py33,py34}-django{15,16},
-       {py27,py32,py33,py34}-django{17,18alpha,master}
+       {py26,py27,py32,py33,py34}-django{15,16}-cython,
+       {py27,py32,py33,py34}-django{17,18alpha,master},
+       {py27,py32,py33,py34}-django{17,18alpha,master}-cython
 
 [testenv]
 commands = ./runtests.py --fast
@@ -14,6 +16,7 @@ deps =
        django15: Django==1.5.6  # Should track minimum supported
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
+       cython: Cython==0.21.2
        django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/
        djangomaster: https://github.com/django/django/zipball/master
        {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3