[tor-commits] [bridgedb/master] Add Travis-CI matrix element for Twisted-15.0.0 and allow failures.

[isis at torproject.org]

commit 4dccceed2feaadc86296598e16c9ce04ad5c8b4e
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Feb 10 22:23:16 2015 +0000

    Add Travis-CI matrix element for Twisted-15.0.0 and allow failures.
    
    We'll now test for the very latest and greatest Twisted, but we don't
    care if tests run on Twisted-15.0.0 fail.  Twisted-15.0.0 isn't included
    yet in any Debian distribution channel.
---
 .travis.yml |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index df8b54f..9da619d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ notifications:
 
 python:
   - "2.7"
-  - "pypy"
 
 addons:
   hosts:
@@ -36,14 +35,22 @@ env:
     #     https://github.com/pypa/virtualenv/issues/459
     - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)"
   matrix:
+    # Debian Wheezy
     - TWISTED_VERSION=13.2.0 PYOPENSSL_VERSION=0.13.1
+    # Debian Jessie
+    - TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14
 
 matrix:
   include:
     - python: "2.7"
+      env: TWISTED_VERSION=15.0.0 PYOPENSSL_VERSION=0.14
+    - python: "pypy"
       env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14
   allow_failures:
+    - python: "2.7"
+      env: TWISTED_VERSION=15.0.0 PYOPENSSL_VERSION=0.14
     - python: "pypy"
+      env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14
   fast_finish: true
 
 before_install: