From 97c2530f90e8ddf0b36539408372f21f5964e9bb Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Sat, 30 Jan 2016 22:05:37 +0100
Subject: allow pypy on travis

---
 .travis.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9091887a..2545899c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ matrix:
   fast_finish: true
   include:
     - python: 2.7
-    - language: generic
-      os: osx
-      osx_image: xcode7.1
     - python: 2.7
       env: OPENSSL=1.0.2
       addons:
@@ -18,9 +15,6 @@ matrix:
             - debian-sid
           packages:
             - libssl-dev
-    - python: 2.7
-      env: DOCS=1
-      script: 'cd docs && make html'
     - python: pypy
     - python: pypy
       env: OPENSSL=1.0.2
@@ -32,10 +26,12 @@ matrix:
             - debian-sid
           packages:
             - libssl-dev
-  allow_failures:
-    # We allow pypy to fail until Travis fixes their infrastructure to a pypy
-    # with a recent enought CFFI library to run cryptography 1.0+.
-    - python: pypy
+    - language: generic
+      os: osx
+      osx_image: xcode7.1
+    - python: 2.7
+      env: DOCS=1
+      script: 'cd docs && make html'
 
 install:
   - |
-- 
cgit v1.2.3