summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Toscano <ltoscano@redhat.com>2018-12-05 22:37:22 +0100
committerLuigi Toscano <ltoscano@redhat.com>2018-12-05 22:37:22 +0100
commit6733240dac59c8e500c2c7fbec85f8e9372a25cb (patch)
tree153aa897e77073bbac5ef866cf374722c8db8ae9
parent25a20dbe5c1fd074a5e2feb1ea9cf2cadde39bc3 (diff)
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
Notes
Notes (review): Code-Review+2: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Workflow+1: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 26 Dec 2018 14:33:41 +0000 Reviewed-on: https://review.openstack.org/623078 Project: openstack/sahara-dashboard Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh2
-rw-r--r--setup.cfg1
-rw-r--r--tox.ini4
3 files changed, 4 insertions, 3 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aa7475f..60636a2 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -12,7 +12,7 @@ function configure_sahara_dashboard {
12 # NOTE: If locale directory does not exist, compilemessages will fail, 12 # NOTE: If locale directory does not exist, compilemessages will fail,
13 # so check for an existence of locale directory is required. 13 # so check for an existence of locale directory is required.
14 if [ -d ${SAHARA_DASH_DIR}/sahara_dashboard/locale ]; then 14 if [ -d ${SAHARA_DASH_DIR}/sahara_dashboard/locale ]; then
15 (cd ${SAHARA_DASH_DIR}/sahara_dashboard; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings ../manage.py compilemessages) 15 (cd ${SAHARA_DASH_DIR}/sahara_dashboard; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $PYTHON ../manage.py compilemessages)
16 fi 16 fi
17} 17}
18 18
diff --git a/setup.cfg b/setup.cfg
index 5bceb24..d3f91f7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
17 Programming Language :: Python :: 2.7 17 Programming Language :: Python :: 2.7
18 Programming Language :: Python :: 3 18 Programming Language :: Python :: 3
19 Programming Language :: Python :: 3.5 19 Programming Language :: Python :: 3.5
20 Programming Language :: Python :: 3.6
20 21
21[files] 22[files]
22packages = 23packages =
diff --git a/tox.ini b/tox.ini
index 1ba62ec..c72b200 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
1[tox] 1[tox]
2minversion = 1.6 2minversion = 2.0
3envlist = py35,py27,pep8,py27dj18 3envlist = py36,py35,py27,pep8,py27dj18
4skipsdist = True 4skipsdist = True
5 5
6[testenv] 6[testenv]