From 958c9b7ffdd3a788c8de8643b31c2b8a1cc85a5c Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 20 Jul 2016 12:29:01 +0200
Subject: [PATCH] Add support for Python 3.5

Change-Id: I7599f3e5d156834138a84be0fac768a2e3767a0d
---
 setup.cfg |  3 +++
 tox.ini   | 21 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 3ec36291..ce94cb2d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,9 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
     Topic :: System :: Monitoring
 
 [global]
diff --git a/tox.ini b/tox.ini
index 048570e7..f0e56f66 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py27,py34,pep8
+envlist = py27,py34,py35,pep8
 
 [testenv]
 deps = -r{toxinidir}/requirements.txt
@@ -25,6 +25,11 @@ basepython = python3.4
 setenv = OS_TEST_PATH=panko/tests/functional/
 commands = pifpaf run mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
+[testenv:py35-mongodb]
+basepython = python3.5
+setenv = OS_TEST_PATH=panko/tests/functional/
+commands = pifpaf run mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
+
 [testenv:py27-mysql]
 setenv = OS_TEST_PATH=panko/tests/functional/
 commands = pifpaf run mysql {toxinidir}/tools/pretty_tox.sh "{posargs}"
@@ -34,6 +39,11 @@ basepython = python3.4
 setenv = OS_TEST_PATH=panko/tests/functional/
 commands = pifpaf run mysql {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
+[testenv:py35-mysql]
+basepython = python3.5
+setenv = OS_TEST_PATH=panko/tests/functional/
+commands = pifpaf run mysql {toxinidir}/tools/pretty_tox.sh "{posargs}"
+
 [testenv:py27-postgresql]
 setenv = OS_TEST_PATH=panko/tests/functional/
 commands = pifpaf run postgresql {toxinidir}/tools/pretty_tox.sh "{posargs}"
@@ -43,6 +53,11 @@ basepython = python3.4
 setenv = OS_TEST_PATH=panko/tests/functional/
 commands = pifpaf run postgresql {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
+[testenv:py35-postgresql]
+basepython = python3.5
+setenv = OS_TEST_PATH=panko/tests/functional/
+commands = pifpaf run postgresql {toxinidir}/tools/pretty_tox.sh "{posargs}"
+
 [testenv:py27-elastic]
 setenv = OS_TEST_PATH=panko/tests/functional/
 commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
@@ -51,6 +66,10 @@ commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
 setenv = OS_TEST_PATH=panko/tests/functional/
 commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
+[testenv:py35-elastic]
+setenv = OS_TEST_PATH=panko/tests/functional/
+commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
+
 # NOTE(chdent): The gabbi tests are also run under the other functional
 # tox targets. This target simply provides a target to directly run just
 # gabbi tests without needing to do discovery across the entire body of