From c2ca6aee26ce451e9e05de46e6fcb679d55f52d8 Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Thu, 3 Apr 2014 14:39:33 -0400
Subject: [PATCH] allow failures in Python 3

---
 .travis.yml |  5 ++++-
 tox.ini     | 23 +----------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da2b4e7e..3a9f759e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: python
 python:
     - "2.7"
+    - "3.3"
 env:
-    - DJANGO_PACKAGE="Django<1.5"
     - DJANGO_PACKAGE="Django<1.7"
 services: mongodb
 install: pip install pymongo nose name_tools validictory scrapelib jellyfish $DJANGO_PACKAGE pytz  icalendar boto python-dateutil -e hg+https://bitbucket.org/jespern/django-piston#egg=django-piston -e git://github.com/jdunck/python-unicodecsv.git#egg=unicodecsv --use-mirrors 
@@ -14,3 +14,6 @@ notifications:
         - jturk@sunlightfoundation.com
         - paultag@sunlightfoundation.com
         - tneale@sunlightfoundation.com
+matrix:
+    allow_failures:
+        - python: "3.3"
diff --git a/tox.ini b/tox.ini
index d5a6db15..8837e8a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,5 @@
 [tox]
-envlist = py27-django14,py27-django16
-
-[testenv:py27-django14]
-whitelist_externals=cp
-commands =
-    cp billy_test_settings.py billy_settings.py
-    nosetests
-    django-admin.py test api --settings=billy.tests.django_settings --pythonpath=.
-deps =
-    pymongo
-    nose
-    name_tools
-    validictory
-    scrapelib
-    jellyfish
-    unicodecsv==0.9.0
-    pytz
-    icalendar
-    boto
-    python-dateutil
-    hg+https://bitbucket.org/jespern/django-piston#egg=django-piston
-    Django>=1.4,<1.5
+envlist = py27-django16
 
 [testenv:py27-django16]
 whitelist_externals=cp