From 636217c70ed157f89db267fea24e8c1c4d98c672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Tue, 9 May 2017 12:48:06 +0300
Subject: [PATCH] Enabled Travis testing on Python 3.5 & 3.6

---
 .travis.yml | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44f300c..8e7bf66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,16 +31,6 @@ env:
   - TOX_ENV=py34-twtrunk
   - TOX_ENV=py34-asyncio
 
-#  - TOX_ENV=py35-tw154
-#  - TOX_ENV=py35-tw165
-#  - TOX_ENV=py35-twtrunk
-#  - TOX_ENV=py35-asyncio
-#
-#  - TOX_ENV=py36-tw154
-#  - TOX_ENV=py36-tw165
-#  - TOX_ENV=py36-twtrunk
-#  - TOX_ENV=py36-asyncio
-
 script:
   - tox -c tox.ini -e $TOX_ENV
 
@@ -70,24 +60,21 @@ matrix:
       env:
       - TOX_ENV=py35-asyncio
 
-    # Python 3.6 currently fails:
-    # https://github.com/crossbario/txaio/issues/83
-    # https://travis-ci.org/crossbario/txaio/builds/192086131
-#    - python: 3.6
-#      env:
-#      - TOX_ENV=py36-tw154
-#
-#    - python: 3.6
-#      env:
-#      - TOX_ENV=py36-tw165
-#
-#    - python: 3.6
-#      env:
-#      - TOX_ENV=py36-twtrunk
-#
-#    - python: 3.6
-#      env:
-#      - TOX_ENV=py36-asyncio
+    - python: 3.6
+      env:
+      - TOX_ENV=py36-tw154
+
+    - python: 3.6
+      env:
+      - TOX_ENV=py36-tw165
+
+    - python: 3.6
+      env:
+      - TOX_ENV=py36-twtrunk
+
+    - python: 3.6
+      env:
+      - TOX_ENV=py36-asyncio
 
 notifications:
    irc: