From 8b648b8775d75dfa25ec10236a784d0d884081c8 Mon Sep 17 00:00:00 2001
From: Camilo Nova <camilo.nova@gmail.com>
Date: Wed, 9 Apr 2014 07:42:18 -0500
Subject: [PATCH] Use django built-in six version

---
 .travis.yml | 8 ++++----
 setup.py    | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a85e0bb..f493bde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,13 @@ python:
   - 2.7
   - 3.3
 env:
-  - PYTHONPATH=$PYTHONPATH:$PWD DJANGO_VERSION=1.4
-  - PYTHONPATH=$PYTHONPATH:$PWD DJANGO_VERSION=1.5
-  - PYTHONPATH=$PYTHONPATH:$PWD DJANGO_VERSION=1.6
+  - PYTHONPATH=$PYTHONPATH:$PWD DJANGO_VERSION=1.4.10
+  - PYTHONPATH=$PYTHONPATH:$PWD DJANGO_VERSION=1.5.5
+  - PYTHONPATH=$PYTHONPATH:$PWD DJANGO_VERSION=1.6.2
 matrix:
     exclude:
         - python: 3.3
-          env: PYTHONPATH=$PYTHONPATH:$PWD DJANGO_VERSION=1.4
+          env: PYTHONPATH=$PYTHONPATH:$PWD DJANGO_VERSION=1.4.10
 install:
   - pip install --use-mirrors Django==$DJANGO_VERSION
 script:
diff --git a/setup.py b/setup.py
index 38b67d1..ed50d6d 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,6 @@ setup(
     license='MIT',
     package_dir={'axes': 'axes'},
     include_package_data=True,
-    install_requires=['six>=1.2'],
     packages=find_packages(),
     classifiers=[
         'Development Status :: 5 - Production/Stable',