From a4e0b3ac7329b5edabab5f905710efb7b02cc739 Mon Sep 17 00:00:00 2001
From: Tobias Oberstein <tobias.oberstein@tavendo.de>
Date: Sun, 6 Dec 2015 09:59:57 +0100
Subject: [PATCH] deprecated Python 2.6; add 3.5

---
 .travis.yml | 35 +++++++++++++++++++++++++----------
 README.rst  |  4 ++--
 tox.ini     |  1 -
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4063430..c20b26a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,27 +6,27 @@ install:
 
 env:
   - TOX_ENV=flake8
+
   - TOX_ENV=py27-tw121
   - TOX_ENV=py27-tw132
   - TOX_ENV=py27-tw154
   - TOX_ENV=py27-twtrunk
   - TOX_ENV=py27-asyncio
-  - TOX_ENV=py34-tw154
-  - TOX_ENV=py34-twtrunk
-  - TOX_ENV=py34-asyncio
-  - TOX_ENV=pypy-tw121 
-#  - TOX_ENV=pypy-tw132
+
+  - TOX_ENV=pypy-tw121
+  - TOX_ENV=pypy-tw132
   - TOX_ENV=pypy-tw154
   - TOX_ENV=pypy-twtrunk
   - TOX_ENV=pypy-asyncio
-  - TOX_ENV=py26-tw121
-  - TOX_ENV=py26-tw132
-  - TOX_ENV=py26-tw154
-  - TOX_ENV=py26-asyncio
+
   - TOX_ENV=py33-tw154
   - TOX_ENV=py33-twtrunk
   - TOX_ENV=py33-asyncio
-# Travis still lacks CPy 3.5 currently (09/25/15)  
+
+  - TOX_ENV=py34-tw154
+  - TOX_ENV=py34-twtrunk
+  - TOX_ENV=py34-asyncio
+
 #  - TOX_ENV=py35-tw154
 #  - TOX_ENV=py35-twtrunk
 #  - TOX_ENV=py35-asyncio
@@ -42,6 +42,21 @@ after_success:
 matrix:
   fast_finish: true
 
+  # https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799
+  include:
+    - python: 3.5
+      env:
+      - TOX_ENV=py35-tw155
+
+    # Twisted trunk
+    - python: 3.5
+      env:
+      - TOX_ENV=py35-twtrunk
+
+    - python: 3.5
+      env:
+      - TOX_ENV=py35-asyncio
+
 notifications:
    irc:
       channels:
diff --git a/README.rst b/README.rst
index 5ed1a34..f9084df 100644
--- a/README.rst
+++ b/README.rst
@@ -22,12 +22,12 @@ either one's event loop to the other using some event loop adapter.
 Platform support
 ----------------
 
-**txaio** runs on CPython 2.6+ and PyPy 2, on top of Twisted or asyncio. Specifically, **txaio** is tested on the following platforms:
+**txaio** runs on CPython 2.7/3.3+ and PyPy 2, on top of Twisted or asyncio. Specifically, **txaio** is tested on the following platforms:
 
-* CPython 2.6 on Twisted 12.1, 13.2, 15.4 and Trollius 2.0
 * CPython 2.7 on Twisted 12.1, 13.2, 15.4, trunk and Trollius 2.0
 * CPython 3.3 on Twisted 15.4, trunk and Trollius 2.0
 * CPython 3.4 on Twisted 15.4, trunk and asyncio (stdlib)
+* CPython 3.5 on Twisted 15.4, trunk and asyncio (stdlib)
 * PyPy 2.5 on Twisted 12.1, 13.2, 15.4, trunk and Trollius 2.0
 
 
diff --git a/tox.ini b/tox.ini
index 096ffcc..75dfa2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
     flake8
-    py26-{tw121,tw132,tw154,asyncio}
     py27-{tw121,tw132,tw154,twtrunk,asyncio}
     pypy-{tw121,tw132,tw154,twtrunk,asyncio}
     py33-{tw154,twtrunk,asyncio}