From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sun, 17 Jun 2012 06:46:03 +0000 (-0700)
Subject: Add py26 back but make it an allowable failure
X-Git-Tag: v2.4.0~60^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9d90e331f729d4c59ef3ff3f9e374372c91abf7;p=thirdparty%2Ftornado.git

Add py26 back but make it an allowable failure
---

diff --git a/.travis.yml b/.travis.yml
index b928c44b3..4505b23be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,14 @@
 # http://travis-ci.org/#!/facebook/tornado
 language: python
-# The build of 2.6 on travis has a bug related to ssl (it segfaults in
-# test_sslv2_fail)
 python:
+    - 2.6
     - 2.7
     - 3.2
+matrix:
+    allow_failures:
+        # The build of 2.6 on travis has a bug related to ssl (it segfaults in
+        # test_sslv2_fail)
+        - python: 2.6
 # TODO: install pycurl, twisted, etc (depends on python version)
 install:
     - python setup.py install