From 1519b38af08cdb93b8e84563be7fc9cdb7fc6b79 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 11 Nov 2016 19:03:18 -0200
Subject: [PATCH 1/2] Allow failure of py35-trial on Travis

Related to #1989
---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8c36a298c..bbc03d856 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,13 +22,17 @@ env:
     - TESTENV=py27-trial
     - TESTENV=py35-pexpect
     - TESTENV=py35-xdist
-    # Disable py35-trial temporarily: #1989
-    #- TESTENV=py35-trial
+    - TESTENV=py35-trial
     - TESTENV=py27-nobyte
     - TESTENV=doctesting
     - TESTENV=freeze
     - TESTENV=docs
 
+matrix:
+  allow_failures:
+    # py35-trial failing on Linux: #1989
+    - env: TESTENV=py35-trial
+
 script: tox --recreate -e $TESTENV
 
 notifications:

From 98caeedd9e22d12184bbef4910650d3e2b1f9dd9 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 11 Nov 2016 19:17:14 -0200
Subject: [PATCH 2/2] Allow failure of pypy on AppVeyor

Related to #1963
---
 appveyor.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index cd95611cb..64c9d6018 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,10 +8,15 @@ environment:
   matrix:
   # create multiple jobs to execute a set of tox runs on each; this is to workaround having
   # builds timing out in AppVeyor
-  # pypy is disabled until #1963 gets fixed
   - TOXENV: "linting,py26,py27,py33,py34,py35"
   - TOXENV: "py27-pexpect,py27-xdist,py27-trial,py35-pexpect,py35-xdist,py35-trial"
   - TOXENV: "py27-nobyte,doctesting,freeze,docs"
+  - TOXENV: "pypy"
+
+matrix:
+  allow_failures:
+    # pypy is disabled until #1963 gets fixed
+    - TOXENV: "pypy"
 
 install:
   - echo Installed Pythons
@@ -21,10 +26,10 @@ install:
   # choco install returns non-zero, because choco install python.pypy is too
   # noisy)
   # pypy is disabled until #1963 gets fixed
-  #- choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
-  #- set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy
-  #- echo PyPy installed
-  #- pypy --version
+  - choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
+  - set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy
+  - echo PyPy installed
+  - pypy --version
 
   - C:\Python35\python -m pip install tox