From 3afcbb391817380a84e9b2a8f585d56766e5a3f5 Mon Sep 17 00:00:00 2001
From: Colin Jermain <cjermain@gmail.com>
Date: Sun, 18 Nov 2018 10:01:10 -0500
Subject: [PATCH 1/5] Replacing end-of-life Python versions with live versions

---
 .travis.yml | 5 +++--
 README.md   | 2 +-
 setup.py    | 7 ++++---
 tox.ini     | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b28cdc..99ed79f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,11 @@ sudo: required
 language: python
 
 python:
-  - 2.6
   - 2.7
-  - 3.3
   - 3.4
+  - 3.5
+  - 3.6
+  - 3.7
   - pypy
 
 env:
diff --git a/README.md b/README.md
index e80586c..30f8d28 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ If you wish to install using the latest upstream C++ Cap'n Proto:
 
 ## Python Versions
 
-Python 2.6/2.7 are supported as well as Python 3.2+. PyPy 2.1+ is also supported.
+Python 2.7, Python 3.4+, and PyPy 2.1+ are supported.
 
 One oddity to note is that `Text` type fields will be treated as byte strings under Python 2, and unicode strings under Python 3. `Data` fields will always be treated as byte strings.
 
diff --git a/setup.py b/setup.py
index a3996a7..83ed9be 100644
--- a/setup.py
+++ b/setup.py
@@ -171,11 +171,12 @@ setup(
         'Programming Language :: C++',
         'Programming Language :: Cython',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Communications'],
 )
diff --git a/tox.ini b/tox.ini
index e41316b..6f64bb5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py32,py33,py34
+envlist = py27,py34,py35,py36,py37
 
 [testenv]
 deps=

From 770896132b43c7f6d0abdc8c8429b1a82f2829e3 Mon Sep 17 00:00:00 2001
From: Colin Jermain <cjermain@gmail.com>
Date: Sun, 18 Nov 2018 10:35:57 -0500
Subject: [PATCH 2/5] Adding patch to Travis CI for Python 3.7 support

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 99ed79f..e0b10ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,13 @@ python:
   - 3.7
   - pypy
 
+# Travis CI support for Python 3.7 currently requires patch (https://github.com/travis-ci/travis-ci/issues/9815)
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
+
 env:
   - BUILD_CAPNP=
   - BUILD_CAPNP=true

From 7052cdbaba113771f28aa1805899c1a49585b6c2 Mon Sep 17 00:00:00 2001
From: Colin Jermain <cjermain@gmail.com>
Date: Sun, 18 Nov 2018 10:52:58 -0500
Subject: [PATCH 3/5] Removing Python 3.7 from normal Travis Python list

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e0b10ef..2b3b303 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - 3.7
   - pypy
 
 # Travis CI support for Python 3.7 currently requires patch (https://github.com/travis-ci/travis-ci/issues/9815)

From afe72a15b1441c1df4eb64a65242621cd8e29976 Mon Sep 17 00:00:00 2001
From: Colin Jermain <cjermain@gmail.com>
Date: Sun, 18 Nov 2018 15:39:33 -0500
Subject: [PATCH 4/5] Setting distro to Xenial globally in attempt to get
 Python 3.7 CI

---
 .travis.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b3b303..bcd76be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# Travis CI support for Python 3.7 requires Xenial (https://github.com/travis-ci/travis-ci/issues/9815)
+dist: xenial
+
 # Use older, non-container infrastructure to allow sudo
 sudo: required
 
@@ -8,15 +11,9 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
   - pypy
 
-# Travis CI support for Python 3.7 currently requires patch (https://github.com/travis-ci/travis-ci/issues/9815)
-matrix:
-  include:
-    - python: 3.7
-      dist: xenial
-      sudo: true
-
 env:
   - BUILD_CAPNP=
   - BUILD_CAPNP=true

From 2b26665f5613258e8ca63f09c9c76c2d6bf8c122 Mon Sep 17 00:00:00 2001
From: Colin Jermain <cjermain@gmail.com>
Date: Sun, 18 Nov 2018 16:27:09 -0500
Subject: [PATCH 5/5] Removing Python 3.7 from this PR

---
 .travis.yml | 4 ----
 setup.py    | 1 -
 tox.ini     | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bcd76be..a852039 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,3 @@
-# Travis CI support for Python 3.7 requires Xenial (https://github.com/travis-ci/travis-ci/issues/9815)
-dist: xenial
-
 # Use older, non-container infrastructure to allow sudo
 sudo: required
 
@@ -11,7 +8,6 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - 3.7
   - pypy
 
 env:
diff --git a/setup.py b/setup.py
index 83ed9be..c7c7b79 100644
--- a/setup.py
+++ b/setup.py
@@ -176,7 +176,6 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Communications'],
 )
diff --git a/tox.ini b/tox.ini
index 6f64bb5..75af016 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,py37
+envlist = py27,py34,py35,py36
 
 [testenv]
 deps=