Merge branch 'feature/3.6-support' into develop

glennmatthews · Jan 18, 2017 · 354a3f0 · 354a3f0
2 parents 1ac4a16 + b87b50f
commit 354a3f0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - 3.6
 
 addons:
   apt:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,13 @@ Change Log
 All notable changes to the COT project will be documented in this file.
 This project adheres to `Semantic Versioning`_.
 
+`Unreleased`_
+-------------
+
+**Added**
+
+- Support for Python 3.6
+
 `1.8.2`_ - 2017-01-18
 ---------------------
 

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 # setup.py - installer script for COT package
 #
 # April 2014, Glenn F. Matthews
-# Copyright (c) 2014-2016 the COT project developers.
+# Copyright (c) 2014-2017 the COT project developers.
 # See the COPYRIGHT.txt file at the top-level directory of this distribution
 # and at https://github.com/glennmatthews/cot/blob/master/COPYRIGHT.txt.
 #
@@ -169,6 +169,7 @@ def with_project_on_sys_path(self, func):
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     keywords='virtualization ovf ova esxi vmware vcenter',
 )
diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,7 @@ max-complexity = 10
 minversion=2.3.1
 envlist =
     setup
-    py{26,27,33,34,35,py}
+    py{26,27,33,34,35,36,py}
     flake8
     pylint
     docs
@@ -24,6 +24,8 @@ envlist =
 3.3 = setup,                 py33,       stats
 3.4 = setup, flake8, pylint, py34, docs, stats
 3.5 = setup,         pylint, py35,       stats
+# No pylint support for 3.6 yet - https://github.com/PyCQA/pylint/issues/1072
+3.6 = setup,                 py36,       stats
 PyPy = setup,                pypy,       stats
 
 [testenv]