From 6733240dac59c8e500c2c7fbec85f8e9372a25cb Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Wed, 5 Dec 2018 22:37:22 +0100
Subject: [PATCH] Few python3 (and 3.6) compatibility improvements

- devstack plugin: run manage.py using $PYTHON (defined by devstack,
  it points to the Python interpreter used by DevStack;
- add an explicit envlist for py36;
- add the classifier for Python 3.6 to setup.cfg;
- bump the minumum tox version to 2.0, which is the de-facto
  minimum version.

Change-Id: I2bce1562b9ac49abf2e80efd3d6df392e40328b1
---
 devstack/plugin.sh | 2 +-
 setup.cfg          | 1 +
 tox.ini            | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aa7475f6..60636a23 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -12,7 +12,7 @@ function configure_sahara_dashboard {
     # NOTE: If locale directory does not exist, compilemessages will fail,
     # so check for an existence of locale directory is required.
     if [ -d ${SAHARA_DASH_DIR}/sahara_dashboard/locale ]; then
-        (cd ${SAHARA_DASH_DIR}/sahara_dashboard; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings ../manage.py compilemessages)
+        (cd ${SAHARA_DASH_DIR}/sahara_dashboard; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $PYTHON ../manage.py compilemessages)
     fi
 }
 
diff --git a/setup.cfg b/setup.cfg
index 5bceb24c..d3f91f7c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 1ba62ec9..c72b2009 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 1.6
-envlist = py35,py27,pep8,py27dj18
+minversion = 2.0
+envlist = py36,py35,py27,pep8,py27dj18
 skipsdist = True
 
 [testenv]