From 246df32c07d893a552458968e73a4be666ee19e2 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 8 Jun 2014 11:42:43 -0700 Subject: [PATCH] Move dashboard into stackalytics Installing a global module called dashboard is bad form as it pollutes the global namespace. Change-Id: I4b7ff8a4bbcb34a24f751d874c5f1894e75ae10c Closes-Bug: #1320133 --- setup.cfg | 5 +++-- {dashboard => stackalytics/dashboard}/__init__.py | 0 .../dashboard}/decorators.py | 6 +++--- {dashboard => stackalytics/dashboard}/helpers.py | 4 ++-- {dashboard => stackalytics/dashboard}/kpi.py | 2 +- .../dashboard}/memory_storage.py | 0 .../dashboard}/parameters.py | 2 +- {dashboard => stackalytics/dashboard}/reports.py | 6 +++--- .../static/css/fonts/ostackportal_moon.eot | Bin .../static/css/fonts/ostackportal_moon.svg | 0 .../static/css/fonts/ostackportal_moon.ttf | Bin .../static/css/fonts/ostackportal_moon.woff | Bin .../css/jquery-ui/images/animated-overlay.gif | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_75_ffffff_40x100.png | Bin .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../jquery-ui/images/ui-icons_222222_256x240.png | Bin .../jquery-ui/images/ui-icons_2e83ff_256x240.png | Bin .../jquery-ui/images/ui-icons_454545_256x240.png | Bin .../jquery-ui/images/ui-icons_888888_256x240.png | Bin .../jquery-ui/images/ui-icons_cd0a0a_256x240.png | Bin .../css/jquery-ui/jquery-ui-1.10.4.custom.css | 0 .../dashboard}/static/css/jquery.dataTables.css | 0 .../dashboard}/static/css/jquery.jqplot.min.css | 0 .../dashboard}/static/css/moonfonts.css | 0 .../dashboard}/static/css/select2.css | 0 .../dashboard}/static/css/style.css | 0 .../dashboard}/static/images/back_disabled.png | Bin .../dashboard}/static/images/back_enabled.png | Bin .../static/images/back_enabled_hover.png | Bin .../dashboard}/static/images/favicon.png | Bin .../dashboard}/static/images/footer_tile.jpg | Bin .../dashboard}/static/images/forward_disabled.png | Bin .../dashboard}/static/images/forward_enabled.png | Bin .../static/images/forward_enabled_hover.png | Bin .../dashboard}/static/images/noise_lightblue.jpg | Bin .../dashboard}/static/images/noise_lightgray.jpg | Bin .../dashboard}/static/images/select2-spinner.gif | Bin .../dashboard}/static/images/select2.png | Bin .../dashboard}/static/images/select2x2.png | Bin .../dashboard}/static/images/sort_asc.png | Bin .../static/images/sort_asc_disabled.png | Bin .../dashboard}/static/images/sort_both.png | Bin .../dashboard}/static/images/sort_desc.png | Bin .../static/images/sort_desc_disabled.png | Bin .../dashboard}/static/js/driverlog-ui.js | 0 .../dashboard}/static/js/excanvas.min.js | 0 .../static/js/jqplot.barRenderer.min.js | 0 .../static/js/jqplot.bubbleRenderer.min.js | 0 .../js/jqplot.canvasAxisLabelRenderer.min.js | 0 .../js/jqplot.canvasAxisTickRenderer.min.js | 0 .../static/js/jqplot.canvasTextRenderer.min.js | 0 .../static/js/jqplot.categoryAxisRenderer.min.js | 0 .../dashboard}/static/js/jqplot.cursor.min.js | 0 .../static/js/jqplot.dateAxisRenderer.min.js | 0 .../static/js/jqplot.highlighter.min.js | 0 .../dashboard}/static/js/jqplot.json2.min.js | 0 .../static/js/jqplot.pieRenderer.min.js | 0 .../dashboard}/static/js/jquery-1.9.1.min.js | 0 .../dashboard}/static/js/jquery-ui.min.js | 0 .../dashboard}/static/js/jquery.dataTables.min.js | 0 .../dashboard}/static/js/jquery.gravatar.js | 0 .../dashboard}/static/js/jquery.jqplot.min.js | 0 .../dashboard}/static/js/jquery.timeago.js | 0 .../dashboard}/static/js/jquery.tmpl.js | 0 .../dashboard}/static/js/md5.js | 0 .../dashboard}/static/js/select2.min.js | 0 .../dashboard}/static/js/stackalytics-ui.js | 0 .../dashboard}/templates/404.html | 0 .../templates/_macros/activity_log.html | 0 .../templates/_macros/contribution_summary.html | 0 .../templates/_macros/user_profile.html | 0 .../dashboard}/templates/base.html | 0 .../dashboard}/templates/kpi/base_kpi.html | 0 .../dashboard}/templates/kpi/example.html | 0 .../dashboard}/templates/layout.html | 0 .../dashboard}/templates/overview.html | 0 .../dashboard}/templates/reports/activity.html | 0 .../dashboard}/templates/reports/base_report.html | 0 .../templates/reports/blueprint_summary.html | 0 .../templates/reports/company_activity.html | 0 .../templates/reports/contribution.html | 0 .../dashboard}/templates/reports/driverlog.html | 0 .../dashboard}/templates/reports/members.html | 0 .../templates/reports/open_reviews.html | 0 .../templates/reports/user_activity.html | 0 .../dashboard}/templates/widget.html | 0 {dashboard => stackalytics/dashboard}/vault.py | 2 +- {dashboard => stackalytics/dashboard}/web.py | 14 +++++++------- {dashboard => stackalytics/dashboard}/web.wsgi | 0 tests/api/test_api.py | 2 +- tests/unit/test_web_utils.py | 10 +++++----- 97 files changed, 27 insertions(+), 26 deletions(-) rename {dashboard => stackalytics/dashboard}/__init__.py (100%) rename {dashboard => stackalytics/dashboard}/decorators.py (99%) rename {dashboard => stackalytics/dashboard}/helpers.py (98%) rename {dashboard => stackalytics/dashboard}/kpi.py (94%) rename {dashboard => stackalytics/dashboard}/memory_storage.py (100%) rename {dashboard => stackalytics/dashboard}/parameters.py (98%) rename {dashboard => stackalytics/dashboard}/reports.py (98%) rename {dashboard => stackalytics/dashboard}/static/css/fonts/ostackportal_moon.eot (100%) rename {dashboard => stackalytics/dashboard}/static/css/fonts/ostackportal_moon.svg (100%) rename {dashboard => stackalytics/dashboard}/static/css/fonts/ostackportal_moon.ttf (100%) rename {dashboard => stackalytics/dashboard}/static/css/fonts/ostackportal_moon.woff (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/animated-overlay.gif (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-icons_222222_256x240.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-icons_2e83ff_256x240.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-icons_454545_256x240.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-icons_888888_256x240.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery-ui/jquery-ui-1.10.4.custom.css (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery.dataTables.css (100%) rename {dashboard => stackalytics/dashboard}/static/css/jquery.jqplot.min.css (100%) rename {dashboard => stackalytics/dashboard}/static/css/moonfonts.css (100%) rename {dashboard => stackalytics/dashboard}/static/css/select2.css (100%) rename {dashboard => stackalytics/dashboard}/static/css/style.css (100%) rename {dashboard => stackalytics/dashboard}/static/images/back_disabled.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/back_enabled.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/back_enabled_hover.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/favicon.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/footer_tile.jpg (100%) rename {dashboard => stackalytics/dashboard}/static/images/forward_disabled.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/forward_enabled.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/forward_enabled_hover.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/noise_lightblue.jpg (100%) rename {dashboard => stackalytics/dashboard}/static/images/noise_lightgray.jpg (100%) rename {dashboard => stackalytics/dashboard}/static/images/select2-spinner.gif (100%) rename {dashboard => stackalytics/dashboard}/static/images/select2.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/select2x2.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/sort_asc.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/sort_asc_disabled.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/sort_both.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/sort_desc.png (100%) rename {dashboard => stackalytics/dashboard}/static/images/sort_desc_disabled.png (100%) rename {dashboard => stackalytics/dashboard}/static/js/driverlog-ui.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/excanvas.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.barRenderer.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.bubbleRenderer.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.canvasAxisLabelRenderer.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.canvasAxisTickRenderer.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.canvasTextRenderer.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.categoryAxisRenderer.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.cursor.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.dateAxisRenderer.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.highlighter.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.json2.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jqplot.pieRenderer.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jquery-1.9.1.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jquery-ui.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jquery.dataTables.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jquery.gravatar.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jquery.jqplot.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jquery.timeago.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/jquery.tmpl.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/md5.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/select2.min.js (100%) rename {dashboard => stackalytics/dashboard}/static/js/stackalytics-ui.js (100%) rename {dashboard => stackalytics/dashboard}/templates/404.html (100%) rename {dashboard => stackalytics/dashboard}/templates/_macros/activity_log.html (100%) rename {dashboard => stackalytics/dashboard}/templates/_macros/contribution_summary.html (100%) rename {dashboard => stackalytics/dashboard}/templates/_macros/user_profile.html (100%) rename {dashboard => stackalytics/dashboard}/templates/base.html (100%) rename {dashboard => stackalytics/dashboard}/templates/kpi/base_kpi.html (100%) rename {dashboard => stackalytics/dashboard}/templates/kpi/example.html (100%) rename {dashboard => stackalytics/dashboard}/templates/layout.html (100%) rename {dashboard => stackalytics/dashboard}/templates/overview.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/activity.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/base_report.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/blueprint_summary.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/company_activity.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/contribution.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/driverlog.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/members.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/open_reviews.html (100%) rename {dashboard => stackalytics/dashboard}/templates/reports/user_activity.html (100%) rename {dashboard => stackalytics/dashboard}/templates/widget.html (100%) rename {dashboard => stackalytics/dashboard}/vault.py (99%) rename {dashboard => stackalytics/dashboard}/web.py (98%) rename {dashboard => stackalytics/dashboard}/web.wsgi (100%) diff --git a/setup.cfg b/setup.cfg index d5412c22e..15af5d652 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,8 +18,9 @@ classifier = [files] packages = - dashboard stackalytics +data_files = + share/stackalytics = stackalytics/dashboard/static/* [build_sphinx] all_files = 1 @@ -29,5 +30,5 @@ source-dir = doc/source [entry_points] console_scripts = stackalytics-dump = stackalytics.processor.dump:main - stackalytics-dashboard = dashboard.web:main + stackalytics-dashboard = stackalytics.dashboard.web:main stackalytics-processor = stackalytics.processor.main:main diff --git a/dashboard/__init__.py b/stackalytics/dashboard/__init__.py similarity index 100% rename from dashboard/__init__.py rename to stackalytics/dashboard/__init__.py diff --git a/dashboard/decorators.py b/stackalytics/dashboard/decorators.py similarity index 99% rename from dashboard/decorators.py rename to stackalytics/dashboard/decorators.py index 9062d8af6..775000c52 100644 --- a/dashboard/decorators.py +++ b/stackalytics/dashboard/decorators.py @@ -20,9 +20,9 @@ import flask import six from werkzeug import exceptions -from dashboard import helpers -from dashboard import parameters -from dashboard import vault +from stackalytics.dashboard import helpers +from stackalytics.dashboard import parameters +from stackalytics.dashboard import vault from stackalytics.openstack.common import log as logging from stackalytics.processor import utils from stackalytics import version as stackalytics_version diff --git a/dashboard/helpers.py b/stackalytics/dashboard/helpers.py similarity index 98% rename from dashboard/helpers.py rename to stackalytics/dashboard/helpers.py index 7e67f640c..aae99d814 100644 --- a/dashboard/helpers.py +++ b/stackalytics/dashboard/helpers.py @@ -18,8 +18,8 @@ import re import six -from dashboard import parameters -from dashboard import vault +from stackalytics.dashboard import parameters +from stackalytics.dashboard import vault from stackalytics.processor import utils diff --git a/dashboard/kpi.py b/stackalytics/dashboard/kpi.py similarity index 94% rename from dashboard/kpi.py rename to stackalytics/dashboard/kpi.py index 1c26c4739..4b784982b 100644 --- a/dashboard/kpi.py +++ b/stackalytics/dashboard/kpi.py @@ -15,7 +15,7 @@ import flask -from dashboard import decorators +from stackalytics.dashboard import decorators blueprint = flask.Blueprint('kpi', __name__, url_prefix='/kpi') diff --git a/dashboard/memory_storage.py b/stackalytics/dashboard/memory_storage.py similarity index 100% rename from dashboard/memory_storage.py rename to stackalytics/dashboard/memory_storage.py diff --git a/dashboard/parameters.py b/stackalytics/dashboard/parameters.py similarity index 98% rename from dashboard/parameters.py rename to stackalytics/dashboard/parameters.py index 89787a25e..944fc5f9d 100644 --- a/dashboard/parameters.py +++ b/stackalytics/dashboard/parameters.py @@ -17,7 +17,7 @@ import flask from oslo.config import cfg from six.moves.urllib import parse -from dashboard import vault +from stackalytics.dashboard import vault from stackalytics.openstack.common import log as logging diff --git a/dashboard/reports.py b/stackalytics/dashboard/reports.py similarity index 98% rename from dashboard/reports.py rename to stackalytics/dashboard/reports.py index b97590388..3958fc96c 100644 --- a/dashboard/reports.py +++ b/stackalytics/dashboard/reports.py @@ -21,9 +21,9 @@ import time import flask -from dashboard import decorators -from dashboard import helpers -from dashboard import vault +from stackalytics.dashboard import decorators +from stackalytics.dashboard import helpers +from stackalytics.dashboard import vault from stackalytics.processor import utils diff --git a/dashboard/static/css/fonts/ostackportal_moon.eot b/stackalytics/dashboard/static/css/fonts/ostackportal_moon.eot similarity index 100% rename from dashboard/static/css/fonts/ostackportal_moon.eot rename to stackalytics/dashboard/static/css/fonts/ostackportal_moon.eot diff --git a/dashboard/static/css/fonts/ostackportal_moon.svg b/stackalytics/dashboard/static/css/fonts/ostackportal_moon.svg similarity index 100% rename from dashboard/static/css/fonts/ostackportal_moon.svg rename to stackalytics/dashboard/static/css/fonts/ostackportal_moon.svg diff --git a/dashboard/static/css/fonts/ostackportal_moon.ttf b/stackalytics/dashboard/static/css/fonts/ostackportal_moon.ttf similarity index 100% rename from dashboard/static/css/fonts/ostackportal_moon.ttf rename to stackalytics/dashboard/static/css/fonts/ostackportal_moon.ttf diff --git a/dashboard/static/css/fonts/ostackportal_moon.woff b/stackalytics/dashboard/static/css/fonts/ostackportal_moon.woff similarity index 100% rename from dashboard/static/css/fonts/ostackportal_moon.woff rename to stackalytics/dashboard/static/css/fonts/ostackportal_moon.woff diff --git a/dashboard/static/css/jquery-ui/images/animated-overlay.gif b/stackalytics/dashboard/static/css/jquery-ui/images/animated-overlay.gif similarity index 100% rename from dashboard/static/css/jquery-ui/images/animated-overlay.gif rename to stackalytics/dashboard/static/css/jquery-ui/images/animated-overlay.gif diff --git a/dashboard/static/css/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/dashboard/static/css/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/dashboard/static/css/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/dashboard/static/css/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/dashboard/static/css/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png diff --git a/dashboard/static/css/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/dashboard/static/css/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/dashboard/static/css/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/dashboard/static/css/jquery-ui/images/ui-icons_222222_256x240.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_222222_256x240.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-icons_222222_256x240.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_222222_256x240.png diff --git a/dashboard/static/css/jquery-ui/images/ui-icons_2e83ff_256x240.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-icons_2e83ff_256x240.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_2e83ff_256x240.png diff --git a/dashboard/static/css/jquery-ui/images/ui-icons_454545_256x240.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_454545_256x240.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-icons_454545_256x240.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_454545_256x240.png diff --git a/dashboard/static/css/jquery-ui/images/ui-icons_888888_256x240.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_888888_256x240.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-icons_888888_256x240.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_888888_256x240.png diff --git a/dashboard/static/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png b/stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from dashboard/static/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png rename to stackalytics/dashboard/static/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png diff --git a/dashboard/static/css/jquery-ui/jquery-ui-1.10.4.custom.css b/stackalytics/dashboard/static/css/jquery-ui/jquery-ui-1.10.4.custom.css similarity index 100% rename from dashboard/static/css/jquery-ui/jquery-ui-1.10.4.custom.css rename to stackalytics/dashboard/static/css/jquery-ui/jquery-ui-1.10.4.custom.css diff --git a/dashboard/static/css/jquery.dataTables.css b/stackalytics/dashboard/static/css/jquery.dataTables.css similarity index 100% rename from dashboard/static/css/jquery.dataTables.css rename to stackalytics/dashboard/static/css/jquery.dataTables.css diff --git a/dashboard/static/css/jquery.jqplot.min.css b/stackalytics/dashboard/static/css/jquery.jqplot.min.css similarity index 100% rename from dashboard/static/css/jquery.jqplot.min.css rename to stackalytics/dashboard/static/css/jquery.jqplot.min.css diff --git a/dashboard/static/css/moonfonts.css b/stackalytics/dashboard/static/css/moonfonts.css similarity index 100% rename from dashboard/static/css/moonfonts.css rename to stackalytics/dashboard/static/css/moonfonts.css diff --git a/dashboard/static/css/select2.css b/stackalytics/dashboard/static/css/select2.css similarity index 100% rename from dashboard/static/css/select2.css rename to stackalytics/dashboard/static/css/select2.css diff --git a/dashboard/static/css/style.css b/stackalytics/dashboard/static/css/style.css similarity index 100% rename from dashboard/static/css/style.css rename to stackalytics/dashboard/static/css/style.css diff --git a/dashboard/static/images/back_disabled.png b/stackalytics/dashboard/static/images/back_disabled.png similarity index 100% rename from dashboard/static/images/back_disabled.png rename to stackalytics/dashboard/static/images/back_disabled.png diff --git a/dashboard/static/images/back_enabled.png b/stackalytics/dashboard/static/images/back_enabled.png similarity index 100% rename from dashboard/static/images/back_enabled.png rename to stackalytics/dashboard/static/images/back_enabled.png diff --git a/dashboard/static/images/back_enabled_hover.png b/stackalytics/dashboard/static/images/back_enabled_hover.png similarity index 100% rename from dashboard/static/images/back_enabled_hover.png rename to stackalytics/dashboard/static/images/back_enabled_hover.png diff --git a/dashboard/static/images/favicon.png b/stackalytics/dashboard/static/images/favicon.png similarity index 100% rename from dashboard/static/images/favicon.png rename to stackalytics/dashboard/static/images/favicon.png diff --git a/dashboard/static/images/footer_tile.jpg b/stackalytics/dashboard/static/images/footer_tile.jpg similarity index 100% rename from dashboard/static/images/footer_tile.jpg rename to stackalytics/dashboard/static/images/footer_tile.jpg diff --git a/dashboard/static/images/forward_disabled.png b/stackalytics/dashboard/static/images/forward_disabled.png similarity index 100% rename from dashboard/static/images/forward_disabled.png rename to stackalytics/dashboard/static/images/forward_disabled.png diff --git a/dashboard/static/images/forward_enabled.png b/stackalytics/dashboard/static/images/forward_enabled.png similarity index 100% rename from dashboard/static/images/forward_enabled.png rename to stackalytics/dashboard/static/images/forward_enabled.png diff --git a/dashboard/static/images/forward_enabled_hover.png b/stackalytics/dashboard/static/images/forward_enabled_hover.png similarity index 100% rename from dashboard/static/images/forward_enabled_hover.png rename to stackalytics/dashboard/static/images/forward_enabled_hover.png diff --git a/dashboard/static/images/noise_lightblue.jpg b/stackalytics/dashboard/static/images/noise_lightblue.jpg similarity index 100% rename from dashboard/static/images/noise_lightblue.jpg rename to stackalytics/dashboard/static/images/noise_lightblue.jpg diff --git a/dashboard/static/images/noise_lightgray.jpg b/stackalytics/dashboard/static/images/noise_lightgray.jpg similarity index 100% rename from dashboard/static/images/noise_lightgray.jpg rename to stackalytics/dashboard/static/images/noise_lightgray.jpg diff --git a/dashboard/static/images/select2-spinner.gif b/stackalytics/dashboard/static/images/select2-spinner.gif similarity index 100% rename from dashboard/static/images/select2-spinner.gif rename to stackalytics/dashboard/static/images/select2-spinner.gif diff --git a/dashboard/static/images/select2.png b/stackalytics/dashboard/static/images/select2.png similarity index 100% rename from dashboard/static/images/select2.png rename to stackalytics/dashboard/static/images/select2.png diff --git a/dashboard/static/images/select2x2.png b/stackalytics/dashboard/static/images/select2x2.png similarity index 100% rename from dashboard/static/images/select2x2.png rename to stackalytics/dashboard/static/images/select2x2.png diff --git a/dashboard/static/images/sort_asc.png b/stackalytics/dashboard/static/images/sort_asc.png similarity index 100% rename from dashboard/static/images/sort_asc.png rename to stackalytics/dashboard/static/images/sort_asc.png diff --git a/dashboard/static/images/sort_asc_disabled.png b/stackalytics/dashboard/static/images/sort_asc_disabled.png similarity index 100% rename from dashboard/static/images/sort_asc_disabled.png rename to stackalytics/dashboard/static/images/sort_asc_disabled.png diff --git a/dashboard/static/images/sort_both.png b/stackalytics/dashboard/static/images/sort_both.png similarity index 100% rename from dashboard/static/images/sort_both.png rename to stackalytics/dashboard/static/images/sort_both.png diff --git a/dashboard/static/images/sort_desc.png b/stackalytics/dashboard/static/images/sort_desc.png similarity index 100% rename from dashboard/static/images/sort_desc.png rename to stackalytics/dashboard/static/images/sort_desc.png diff --git a/dashboard/static/images/sort_desc_disabled.png b/stackalytics/dashboard/static/images/sort_desc_disabled.png similarity index 100% rename from dashboard/static/images/sort_desc_disabled.png rename to stackalytics/dashboard/static/images/sort_desc_disabled.png diff --git a/dashboard/static/js/driverlog-ui.js b/stackalytics/dashboard/static/js/driverlog-ui.js similarity index 100% rename from dashboard/static/js/driverlog-ui.js rename to stackalytics/dashboard/static/js/driverlog-ui.js diff --git a/dashboard/static/js/excanvas.min.js b/stackalytics/dashboard/static/js/excanvas.min.js similarity index 100% rename from dashboard/static/js/excanvas.min.js rename to stackalytics/dashboard/static/js/excanvas.min.js diff --git a/dashboard/static/js/jqplot.barRenderer.min.js b/stackalytics/dashboard/static/js/jqplot.barRenderer.min.js similarity index 100% rename from dashboard/static/js/jqplot.barRenderer.min.js rename to stackalytics/dashboard/static/js/jqplot.barRenderer.min.js diff --git a/dashboard/static/js/jqplot.bubbleRenderer.min.js b/stackalytics/dashboard/static/js/jqplot.bubbleRenderer.min.js similarity index 100% rename from dashboard/static/js/jqplot.bubbleRenderer.min.js rename to stackalytics/dashboard/static/js/jqplot.bubbleRenderer.min.js diff --git a/dashboard/static/js/jqplot.canvasAxisLabelRenderer.min.js b/stackalytics/dashboard/static/js/jqplot.canvasAxisLabelRenderer.min.js similarity index 100% rename from dashboard/static/js/jqplot.canvasAxisLabelRenderer.min.js rename to stackalytics/dashboard/static/js/jqplot.canvasAxisLabelRenderer.min.js diff --git a/dashboard/static/js/jqplot.canvasAxisTickRenderer.min.js b/stackalytics/dashboard/static/js/jqplot.canvasAxisTickRenderer.min.js similarity index 100% rename from dashboard/static/js/jqplot.canvasAxisTickRenderer.min.js rename to stackalytics/dashboard/static/js/jqplot.canvasAxisTickRenderer.min.js diff --git a/dashboard/static/js/jqplot.canvasTextRenderer.min.js b/stackalytics/dashboard/static/js/jqplot.canvasTextRenderer.min.js similarity index 100% rename from dashboard/static/js/jqplot.canvasTextRenderer.min.js rename to stackalytics/dashboard/static/js/jqplot.canvasTextRenderer.min.js diff --git a/dashboard/static/js/jqplot.categoryAxisRenderer.min.js b/stackalytics/dashboard/static/js/jqplot.categoryAxisRenderer.min.js similarity index 100% rename from dashboard/static/js/jqplot.categoryAxisRenderer.min.js rename to stackalytics/dashboard/static/js/jqplot.categoryAxisRenderer.min.js diff --git a/dashboard/static/js/jqplot.cursor.min.js b/stackalytics/dashboard/static/js/jqplot.cursor.min.js similarity index 100% rename from dashboard/static/js/jqplot.cursor.min.js rename to stackalytics/dashboard/static/js/jqplot.cursor.min.js diff --git a/dashboard/static/js/jqplot.dateAxisRenderer.min.js b/stackalytics/dashboard/static/js/jqplot.dateAxisRenderer.min.js similarity index 100% rename from dashboard/static/js/jqplot.dateAxisRenderer.min.js rename to stackalytics/dashboard/static/js/jqplot.dateAxisRenderer.min.js diff --git a/dashboard/static/js/jqplot.highlighter.min.js b/stackalytics/dashboard/static/js/jqplot.highlighter.min.js similarity index 100% rename from dashboard/static/js/jqplot.highlighter.min.js rename to stackalytics/dashboard/static/js/jqplot.highlighter.min.js diff --git a/dashboard/static/js/jqplot.json2.min.js b/stackalytics/dashboard/static/js/jqplot.json2.min.js similarity index 100% rename from dashboard/static/js/jqplot.json2.min.js rename to stackalytics/dashboard/static/js/jqplot.json2.min.js diff --git a/dashboard/static/js/jqplot.pieRenderer.min.js b/stackalytics/dashboard/static/js/jqplot.pieRenderer.min.js similarity index 100% rename from dashboard/static/js/jqplot.pieRenderer.min.js rename to stackalytics/dashboard/static/js/jqplot.pieRenderer.min.js diff --git a/dashboard/static/js/jquery-1.9.1.min.js b/stackalytics/dashboard/static/js/jquery-1.9.1.min.js similarity index 100% rename from dashboard/static/js/jquery-1.9.1.min.js rename to stackalytics/dashboard/static/js/jquery-1.9.1.min.js diff --git a/dashboard/static/js/jquery-ui.min.js b/stackalytics/dashboard/static/js/jquery-ui.min.js similarity index 100% rename from dashboard/static/js/jquery-ui.min.js rename to stackalytics/dashboard/static/js/jquery-ui.min.js diff --git a/dashboard/static/js/jquery.dataTables.min.js b/stackalytics/dashboard/static/js/jquery.dataTables.min.js similarity index 100% rename from dashboard/static/js/jquery.dataTables.min.js rename to stackalytics/dashboard/static/js/jquery.dataTables.min.js diff --git a/dashboard/static/js/jquery.gravatar.js b/stackalytics/dashboard/static/js/jquery.gravatar.js similarity index 100% rename from dashboard/static/js/jquery.gravatar.js rename to stackalytics/dashboard/static/js/jquery.gravatar.js diff --git a/dashboard/static/js/jquery.jqplot.min.js b/stackalytics/dashboard/static/js/jquery.jqplot.min.js similarity index 100% rename from dashboard/static/js/jquery.jqplot.min.js rename to stackalytics/dashboard/static/js/jquery.jqplot.min.js diff --git a/dashboard/static/js/jquery.timeago.js b/stackalytics/dashboard/static/js/jquery.timeago.js similarity index 100% rename from dashboard/static/js/jquery.timeago.js rename to stackalytics/dashboard/static/js/jquery.timeago.js diff --git a/dashboard/static/js/jquery.tmpl.js b/stackalytics/dashboard/static/js/jquery.tmpl.js similarity index 100% rename from dashboard/static/js/jquery.tmpl.js rename to stackalytics/dashboard/static/js/jquery.tmpl.js diff --git a/dashboard/static/js/md5.js b/stackalytics/dashboard/static/js/md5.js similarity index 100% rename from dashboard/static/js/md5.js rename to stackalytics/dashboard/static/js/md5.js diff --git a/dashboard/static/js/select2.min.js b/stackalytics/dashboard/static/js/select2.min.js similarity index 100% rename from dashboard/static/js/select2.min.js rename to stackalytics/dashboard/static/js/select2.min.js diff --git a/dashboard/static/js/stackalytics-ui.js b/stackalytics/dashboard/static/js/stackalytics-ui.js similarity index 100% rename from dashboard/static/js/stackalytics-ui.js rename to stackalytics/dashboard/static/js/stackalytics-ui.js diff --git a/dashboard/templates/404.html b/stackalytics/dashboard/templates/404.html similarity index 100% rename from dashboard/templates/404.html rename to stackalytics/dashboard/templates/404.html diff --git a/dashboard/templates/_macros/activity_log.html b/stackalytics/dashboard/templates/_macros/activity_log.html similarity index 100% rename from dashboard/templates/_macros/activity_log.html rename to stackalytics/dashboard/templates/_macros/activity_log.html diff --git a/dashboard/templates/_macros/contribution_summary.html b/stackalytics/dashboard/templates/_macros/contribution_summary.html similarity index 100% rename from dashboard/templates/_macros/contribution_summary.html rename to stackalytics/dashboard/templates/_macros/contribution_summary.html diff --git a/dashboard/templates/_macros/user_profile.html b/stackalytics/dashboard/templates/_macros/user_profile.html similarity index 100% rename from dashboard/templates/_macros/user_profile.html rename to stackalytics/dashboard/templates/_macros/user_profile.html diff --git a/dashboard/templates/base.html b/stackalytics/dashboard/templates/base.html similarity index 100% rename from dashboard/templates/base.html rename to stackalytics/dashboard/templates/base.html diff --git a/dashboard/templates/kpi/base_kpi.html b/stackalytics/dashboard/templates/kpi/base_kpi.html similarity index 100% rename from dashboard/templates/kpi/base_kpi.html rename to stackalytics/dashboard/templates/kpi/base_kpi.html diff --git a/dashboard/templates/kpi/example.html b/stackalytics/dashboard/templates/kpi/example.html similarity index 100% rename from dashboard/templates/kpi/example.html rename to stackalytics/dashboard/templates/kpi/example.html diff --git a/dashboard/templates/layout.html b/stackalytics/dashboard/templates/layout.html similarity index 100% rename from dashboard/templates/layout.html rename to stackalytics/dashboard/templates/layout.html diff --git a/dashboard/templates/overview.html b/stackalytics/dashboard/templates/overview.html similarity index 100% rename from dashboard/templates/overview.html rename to stackalytics/dashboard/templates/overview.html diff --git a/dashboard/templates/reports/activity.html b/stackalytics/dashboard/templates/reports/activity.html similarity index 100% rename from dashboard/templates/reports/activity.html rename to stackalytics/dashboard/templates/reports/activity.html diff --git a/dashboard/templates/reports/base_report.html b/stackalytics/dashboard/templates/reports/base_report.html similarity index 100% rename from dashboard/templates/reports/base_report.html rename to stackalytics/dashboard/templates/reports/base_report.html diff --git a/dashboard/templates/reports/blueprint_summary.html b/stackalytics/dashboard/templates/reports/blueprint_summary.html similarity index 100% rename from dashboard/templates/reports/blueprint_summary.html rename to stackalytics/dashboard/templates/reports/blueprint_summary.html diff --git a/dashboard/templates/reports/company_activity.html b/stackalytics/dashboard/templates/reports/company_activity.html similarity index 100% rename from dashboard/templates/reports/company_activity.html rename to stackalytics/dashboard/templates/reports/company_activity.html diff --git a/dashboard/templates/reports/contribution.html b/stackalytics/dashboard/templates/reports/contribution.html similarity index 100% rename from dashboard/templates/reports/contribution.html rename to stackalytics/dashboard/templates/reports/contribution.html diff --git a/dashboard/templates/reports/driverlog.html b/stackalytics/dashboard/templates/reports/driverlog.html similarity index 100% rename from dashboard/templates/reports/driverlog.html rename to stackalytics/dashboard/templates/reports/driverlog.html diff --git a/dashboard/templates/reports/members.html b/stackalytics/dashboard/templates/reports/members.html similarity index 100% rename from dashboard/templates/reports/members.html rename to stackalytics/dashboard/templates/reports/members.html diff --git a/dashboard/templates/reports/open_reviews.html b/stackalytics/dashboard/templates/reports/open_reviews.html similarity index 100% rename from dashboard/templates/reports/open_reviews.html rename to stackalytics/dashboard/templates/reports/open_reviews.html diff --git a/dashboard/templates/reports/user_activity.html b/stackalytics/dashboard/templates/reports/user_activity.html similarity index 100% rename from dashboard/templates/reports/user_activity.html rename to stackalytics/dashboard/templates/reports/user_activity.html diff --git a/dashboard/templates/widget.html b/stackalytics/dashboard/templates/widget.html similarity index 100% rename from dashboard/templates/widget.html rename to stackalytics/dashboard/templates/widget.html diff --git a/dashboard/vault.py b/stackalytics/dashboard/vault.py similarity index 99% rename from dashboard/vault.py rename to stackalytics/dashboard/vault.py index 2113a9139..1f85a987c 100644 --- a/dashboard/vault.py +++ b/stackalytics/dashboard/vault.py @@ -22,7 +22,7 @@ import itertools from oslo.config import cfg import six -from dashboard import memory_storage +from stackalytics.dashboard import memory_storage from stackalytics.openstack.common import log as logging from stackalytics.processor import runtime_storage from stackalytics.processor import utils diff --git a/dashboard/web.py b/stackalytics/dashboard/web.py similarity index 98% rename from dashboard/web.py rename to stackalytics/dashboard/web.py index 87400294f..b69123c40 100644 --- a/dashboard/web.py +++ b/stackalytics/dashboard/web.py @@ -23,12 +23,12 @@ import flask from oslo.config import cfg import six -from dashboard import decorators -from dashboard import helpers -from dashboard import kpi -from dashboard import parameters -from dashboard import reports -from dashboard import vault +from stackalytics.dashboard import decorators +from stackalytics.dashboard import helpers +from stackalytics.dashboard import kpi +from stackalytics.dashboard import parameters +from stackalytics.dashboard import reports +from stackalytics.dashboard import vault from stackalytics.openstack.common import log as logging from stackalytics.processor import config from stackalytics.processor import utils @@ -601,7 +601,7 @@ def main(): else: conf(project='stackalytics') - logging.setup('dashboard') + logging.setup('stackalytics.dashboard') app.run(cfg.CONF.listen_host, cfg.CONF.listen_port) diff --git a/dashboard/web.wsgi b/stackalytics/dashboard/web.wsgi similarity index 100% rename from dashboard/web.wsgi rename to stackalytics/dashboard/web.wsgi diff --git a/tests/api/test_api.py b/tests/api/test_api.py index c41191788..3515edbb9 100644 --- a/tests/api/test_api.py +++ b/tests/api/test_api.py @@ -21,7 +21,7 @@ import mock import six import testtools -from dashboard import web +from stackalytics.dashboard import web from stackalytics.processor import runtime_storage diff --git a/tests/unit/test_web_utils.py b/tests/unit/test_web_utils.py index fbdaf78b3..d83724c98 100644 --- a/tests/unit/test_web_utils.py +++ b/tests/unit/test_web_utils.py @@ -16,8 +16,8 @@ import mock import testtools -from dashboard import helpers -from dashboard import parameters +from stackalytics.dashboard import helpers +from stackalytics.dashboard import parameters class TestWebUtils(testtools.TestCase): @@ -83,8 +83,8 @@ Implements Blueprint ''' + ( self.assertEqual(expected, observed, 'Commit message should be processed correctly') - @mock.patch('dashboard.vault.get_vault') - @mock.patch('dashboard.vault.get_user_from_runtime_storage') + @mock.patch('stackalytics.dashboard.vault.get_vault') + @mock.patch('stackalytics.dashboard.vault.get_user_from_runtime_storage') def test_make_page_title(self, user_patch, vault_patch): memory_storage_mock = mock.Mock() memory_storage_mock.get_original_company_name = mock.Mock( @@ -107,7 +107,7 @@ Implements Blueprint ''' + ( 'Mirantis', 'John Doe', 'neutron', 'Havana')) @mock.patch('flask.request') - @mock.patch('dashboard.parameters.get_default') + @mock.patch('stackalytics.dashboard.parameters.get_default') def test_parameters_get_parameter(self, get_default, flask_request): flask_request.args = mock.Mock()