Merge branch 'develop' into feature/schema-parser-header

.travis.yml

@@ -4,10 +4,10 @@ sudo: required
 language: python
 
 python:
-  - 2.6
   - 2.7
-  - 3.3
   - 3.4
+  - 3.5
+  - 3.6
   - pypy
 
 env:

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.
 

setup.py

@@ -171,11 +171,11 @@ 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.4',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Communications'],
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py32,py33,py34
+envlist = py27,py34,py35,py36
 
 [testenv]
 deps=