From 9c07a1287cc39a304d027bf6e3b2ee05b11d0641 Mon Sep 17 00:00:00 2001
From: Martin Packman <martin@zegami.com>
Date: Mon, 31 Jul 2017 13:49:16 +0100
Subject: [PATCH] Test and support Python 3.6

Add py36 to the Travis CI config, and setup.py classifiers.

Also tweak local tox config, install twisted for 3.6 and make
noptionals variant use 2.7 and 3.6 only, as suggested by
@brian-brazil in review.
---
 .travis.yml | 6 ++++--
 setup.py    | 1 +
 tox.ini     | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0374900b..4235609d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,8 +33,10 @@ matrix:
       env: TOXENV=py34
     - python: "3.5"
       env: TOXENV=py35
-    - python: "3.5"
-      env: TOXENV=py35-nooptionals
+    - python: "3.6"
+      env: TOXENV=py36
+    - python: "3.6"
+      env: TOXENV=py36-nooptionals
     - python: "pypy"
       env: TOXENV=pypy
 
diff --git a/setup.py b/setup.py
index 8bfa66d2..43c78991 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: System :: Monitoring",
diff --git a/tox.ini b/tox.ini
index 55f18a6c..b20f486b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = coverage-clean,py26,py27,py34,py35,py36,pypy,{py27,py35,py36}-nooptionals,coverage-report
+envlist = coverage-clean,py26,py27,py34,py35,py36,pypy,{py27,py36}-nooptionals,coverage-report
 
 
 [base]
@@ -12,7 +12,7 @@ deps =
     {[base]deps}
     py26: unittest2
     ; Twisted does not support Python 2.6.
-    {py27,py34,py35,pypy}: twisted
+    {py27,py34,py35,py36,pypy}: twisted
 commands = coverage run --parallel -m pytest {posargs}
 
 
@@ -21,7 +21,7 @@ commands = coverage run --parallel -m pytest {posargs}
 deps = {[base]deps}
 commands = coverage run --parallel -m pytest {posargs}
 
-[testenv:py35-nooptionals]
+[testenv:py36-nooptionals]
 deps = {[base]deps}
 commands = coverage run --parallel -m pytest {posargs}
 
@@ -37,4 +37,4 @@ deps = coverage
 skip_install = true
 commands =
     coverage combine
-    coverage report
\ No newline at end of file
+    coverage report