From 49cffd1c18de23459b92e82cd8adafd36392ccaf Mon Sep 17 00:00:00 2001 From: Eyal Date: Thu, 26 Apr 2018 15:53:20 +0300 Subject: [PATCH] support py3 manage.py should use the correct interpreter when installing devstack Change-Id: I78e352db36553ddfab8498efdf712aa806047fc5 --- devstack/plugin.sh | 2 +- heat_dashboard/test/settings.py | 1 + setup.cfg | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 40559f22..119e244c 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -21,7 +21,7 @@ function configure_heat_dashboard { # NOTE: If locale directory does not exist, compilemessages will fail, # so check for an existence of locale directory is required. if [ -d ${HEAT_DASHBOARD_DIR}/heat_dashboard/locale ]; then - (cd ${HEAT_DASHBOARD_DIR}/heat_dashboard; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings ../manage.py compilemessages) + (cd ${HEAT_DASHBOARD_DIR}/heat_dashboard; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $PYTHON ../manage.py compilemessages) fi } diff --git a/heat_dashboard/test/settings.py b/heat_dashboard/test/settings.py index 23e90938..065eb176 100644 --- a/heat_dashboard/test/settings.py +++ b/heat_dashboard/test/settings.py @@ -13,6 +13,7 @@ # Default to Horizons test settings to avoid any missing keys import heat_dashboard.enabled +import openstack_dashboard.enabled from openstack_dashboard.test.settings import * # noqa: F403,H303 diff --git a/setup.cfg b/setup.cfg index 81404ed3..a0c8ed2b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,6 +18,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.4 + Programming Language :: Python :: 3.5 [files] packages =