From b752b8a0dd47990e28b3b65d17182c20c68549b9 Mon Sep 17 00:00:00 2001
From: Christopher Peplin <chris.peplin@rhubarbtech.com>
Date: Sun, 17 Sep 2017 12:40:55 -0400
Subject: [PATCH] Officially mark Python 3.6 as supported, enable unit testing.

---
 .travis.yml   | 8 +++++---
 CHANGELOG.rst | 5 +++++
 README.rst    | 7 +++----
 tox.ini       | 4 +++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d442c7b7..278816f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,15 @@
 language: python
 sudo: false
 python:
-- '3.5'
+  - '2.7'
+  - '3.4'
+  - '3.5'
+  - '3.6'
 cache:
   directories:
   - "$HOME/.cache/pip"
   - ".tox"
-install:
-- pip install tox
+install: pip install tox-travis
 script: tox --recreate
 deploy:
   provider: pypi
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 64eb052a..b88f8425 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,11 @@
 Release History
 ================
 
+V3.2.1
+------
+
+- Improvement: Officially support Python 3.6.
+
 V3.2.0
 ------
 
diff --git a/README.rst b/README.rst
index efc7856f..004711fa 100644
--- a/README.rst
+++ b/README.rst
@@ -23,11 +23,10 @@ leaves something to be desired and only works in Linux.
 Requirements
 ------------
 
--  Python 2.7
+-  Python 2.7.5 or greater, or Python 3.5 or greater
 
-   -  The latest version is recommended. Earlier versions (for example
-      2.7.3) will not connect to the USB adapter at all and fail during
-      ``struct.unpack`` calls.
+   -  Python 2.7.3's ``struct`` library has a bug that will break PyGATT - 2.7.5
+         or greater is recommended.
 
 -  BlueZ 5.18 or greater (with gatttool) - required for the gatttool
    backend only.
diff --git a/tox.ini b/tox.ini
index 85db6af6..f247a08d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,9 @@
 
 [tox]
 envlist = py27
+          py34
           py35
+          py36
 
 [testenv]
 sitepackages=False
@@ -16,4 +18,4 @@ deps = -r{toxinidir}/requirements.txt
 
 [flake8]
 max-line-length = 80
-exclude=*.egg,.eggs,.tox,./lib,./bin,./env,./env3.5
+exclude=*.egg,.eggs,.tox,./lib,./bin,./env,./env3.5,./env3.4,./env3.6