From 622df39583474511c9f606265be124cfc1a6bb17 Mon Sep 17 00:00:00 2001 From: rossella Date: Mon, 18 Apr 2016 13:27:14 +0000 Subject: [PATCH] Use pip to install gerrit-dash-creator Change-Id: I791233367dac6132c01586f5aa6c48903fcb5218 --- requirements.txt | 2 +- reviewday/util.py | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8ef49da..4f4f822 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ launchpadlib PyYAML Cheetah simplejson --e git+https://git.openstack.org/openstack/gerrit-dash-creator#egg=gerrit_dash_creator +gerrit-dash-creator diff --git a/reviewday/util.py b/reviewday/util.py index e4309dd..388ece4 100644 --- a/reviewday/util.py +++ b/reviewday/util.py @@ -4,7 +4,6 @@ import html_helper import subprocess from Cheetah.Template import Template from distutils.dir_util import copy_tree -import gerrit_dash_creator def prep_out_dir(out_dir): @@ -55,15 +54,10 @@ def _create_data_html(out_dir, name_space={}): def create_projects_dashboard(out_dir): - gerrit_dash_bin = os.path.join(os.path.dirname( - gerrit_dash_creator.__file__), '../gerrit-dash-creator') - template_dir = os.path.join(os.path.dirname( - gerrit_dash_creator.__file__), '../templates') dashboard_file = '%s/milestone.dash' % out_dir os.system('bin/neutron -o %s' % dashboard_file) - p = subprocess.Popen([gerrit_dash_bin, - dashboard_file, - '--template-directory', '%s' % template_dir], + p = subprocess.Popen(['gerrit-dash-creator', + dashboard_file], stdout=subprocess.PIPE, stderr=subprocess.PIPE) neutron_dash, err = p.communicate()