Dashed
+Caravel
an open source data visualization platform
diff --git a/caravel/utils.py b/caravel/utils.py index 1a7f8f4579de8..9944be2722d8a 100644 --- a/caravel/utils.py +++ b/caravel/utils.py @@ -1,4 +1,4 @@ -"""Utility functions used across Dashed""" +"""Utility functions used across Caravel""" from datetime import datetime import hashlib @@ -169,11 +169,11 @@ def get(self, s): return self.BNB_COLORS[i % len(self.BNB_COLORS)] -def init(dashed): - """Inits the Dashed application with security roles and such""" - db = dashed.db - models = dashed.models - sm = dashed.appbuilder.sm +def init(caravel): + """Inits the Caravel application with security roles and such""" + db = caravel.db + models = caravel.models + sm = caravel.appbuilder.sm alpha = sm.add_role("Alpha") admin = sm.add_role("Admin") diff --git a/caravel/views.py b/caravel/views.py index cec973b164ab9..11f76f58d1c62 100644 --- a/caravel/views.py +++ b/caravel/views.py @@ -1,4 +1,4 @@ -"""Flask web views for Dashed""" +"""Flask web views for Caravel""" from datetime import datetime import json @@ -21,7 +21,7 @@ from sqlalchemy import select, text from sqlalchemy.sql.expression import TextAsFrom -from dashed import appbuilder, db, models, viz, utils, app, sm, ascii_art +from caravel import appbuilder, db, models, viz, utils, app, sm, ascii_art config = app.config log_this = models.Log.log_this @@ -44,11 +44,11 @@ def muldelete(self, items): return redirect(self.get_redirect()) -class DashedModelView(ModelView): +class CaravelModelView(ModelView): page_size = 500 -class TableColumnInlineView(CompactCRUDMixin, DashedModelView): # noqa +class TableColumnInlineView(CompactCRUDMixin, CaravelModelView): # noqa datamodel = SQLAInterface(models.TableColumn) can_delete = False edit_columns = [ @@ -69,7 +69,7 @@ class TableColumnInlineView(CompactCRUDMixin, DashedModelView): # noqa -class DruidColumnInlineView(CompactCRUDMixin, DashedModelView): # noqa +class DruidColumnInlineView(CompactCRUDMixin, CaravelModelView): # noqa datamodel = SQLAInterface(models.DruidColumn) edit_columns = [ 'column_name', 'description', 'datasource', 'groupby', @@ -86,7 +86,7 @@ def post_update(self, col): appbuilder.add_view_no_menu(DruidColumnInlineView) -class SqlMetricInlineView(CompactCRUDMixin, DashedModelView): # noqa +class SqlMetricInlineView(CompactCRUDMixin, CaravelModelView): # noqa datamodel = SQLAInterface(models.SqlMetric) list_columns = ['metric_name', 'verbose_name', 'metric_type'] edit_columns = [ @@ -97,7 +97,7 @@ class SqlMetricInlineView(CompactCRUDMixin, DashedModelView): # noqa appbuilder.add_view_no_menu(SqlMetricInlineView) -class DruidMetricInlineView(CompactCRUDMixin, DashedModelView): # noqa +class DruidMetricInlineView(CompactCRUDMixin, CaravelModelView): # noqa datamodel = SQLAInterface(models.DruidMetric) list_columns = ['metric_name', 'verbose_name', 'metric_type'] edit_columns = [ @@ -112,15 +112,15 @@ class DruidMetricInlineView(CompactCRUDMixin, DashedModelView): # noqa appbuilder.add_view_no_menu(DruidMetricInlineView) -class DatabaseView(DashedModelView, DeleteMixin): # noqa +class DatabaseView(CaravelModelView, DeleteMixin): # noqa datamodel = SQLAInterface(models.Database) list_columns = ['database_name', 'sql_link', 'created_by_', 'changed_on'] order_columns = utils.list_minus(list_columns, ['created_by_']) add_columns = ['database_name', 'sqlalchemy_uri', 'cache_timeout'] search_exclude_columns = ('password',) edit_columns = add_columns - add_template = "dashed/models/database/add.html" - edit_template = "dashed/models/database/edit.html" + add_template = "caravel/models/database/add.html" + edit_template = "caravel/models/database/edit.html" base_order = ('changed_on', 'desc') description_columns = { 'sqlalchemy_uri': ( @@ -147,7 +147,7 @@ def pre_update(self, db): category_icon='fa-database',) -class TableModelView(DashedModelView, DeleteMixin): # noqa +class TableModelView(CaravelModelView, DeleteMixin): # noqa datamodel = SQLAInterface(models.SqlaTable) list_columns = [ 'table_link', 'database', 'sql_link', 'is_featured', @@ -190,7 +190,7 @@ def post_update(self, table): appbuilder.add_separator("Sources") -class DruidClusterModelView(DashedModelView, DeleteMixin): # noqa +class DruidClusterModelView(CaravelModelView, DeleteMixin): # noqa datamodel = SQLAInterface(models.DruidCluster) add_columns = [ 'cluster_name', @@ -210,7 +210,7 @@ class DruidClusterModelView(DashedModelView, DeleteMixin): # noqa category_icon='fa-database',) -class SliceModelView(DashedModelView, DeleteMixin): # noqa +class SliceModelView(CaravelModelView, DeleteMixin): # noqa datamodel = SQLAInterface(models.Slice) can_add = False label_columns = { @@ -252,7 +252,7 @@ class SliceAsync(SliceModelView): # noqa appbuilder.add_view_no_menu(SliceAsync) -class DashboardModelView(DashedModelView, DeleteMixin): # noqa +class DashboardModelView(CaravelModelView, DeleteMixin): # noqa datamodel = SQLAInterface(models.Dashboard) label_columns = { 'created_by_': 'Creator', @@ -301,7 +301,7 @@ class DashboardModelViewAsync(DashboardModelView): # noqa appbuilder.add_view_no_menu(DashboardModelViewAsync) -class LogModelView(DashedModelView): +class LogModelView(CaravelModelView): datamodel = SQLAInterface(models.Log) list_columns = ('user', 'action', 'dttm') edit_columns = ('user', 'action', 'dttm', 'json') @@ -314,7 +314,7 @@ class LogModelView(DashedModelView): icon="fa-list-ol") -class DruidDatasourceModelView(DashedModelView, DeleteMixin): # noqa +class DruidDatasourceModelView(CaravelModelView, DeleteMixin): # noqa datamodel = SQLAInterface(models.DruidDatasource) list_columns = [ 'datasource_link', 'cluster', 'owner', @@ -390,9 +390,9 @@ def shortner(self): appbuilder.add_view_no_menu(R) -class Dashed(BaseView): +class Caravel(BaseView): - """The base views for Dashed!""" + """The base views for Caravel!""" @has_access @expose("/explore/
Dashed
+Caravel
an open source data visualization platform
@@ -80,7 +80,7 @@Connect
Dashed
+Caravel
is an open source data visualization platform that provides easy exploration of your data and allows you to create and share diff --git a/docs/build.sh b/docs/build.sh index ff54c955cb176..8347f2a479147 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash rm -rf _build make html -cp -r ../dashed/assets/images/ _build/html/_static/img/ -rm -rf /tmp/dashed-docs -cp -r _build/html /tmp/dashed-docs +cp -r ../caravel/assets/images/ _build/html/_static/img/ +rm -rf /tmp/caravel-docs +cp -r _build/html /tmp/caravel-docs diff --git a/docs/conf.py b/docs/conf.py index 6be2338a55459..c362857add598 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# dashed documentation build configuration file, created by +# caravel documentation build configuration file, created by # sphinx-quickstart on Thu Dec 17 15:42:06 2015. # # This file is execfile()d with the current directory set to its @@ -51,7 +51,7 @@ master_doc = 'index' # General information about the project. -project = u'dashed' +project = u'caravel' copyright = u'2015, Maxime Beauchemin, Airbnb' author = u'Maxime Beauchemin' @@ -121,7 +121,7 @@ # documentation. html_theme_options = { # 'bootswatch_theme': 'cosmo', - 'navbar_title': 'Dashed Documentation', + 'navbar_title': 'Caravel Documentation', 'navbar_fixed_top': "false", 'navbar_sidebarrel': False, 'navbar_site_name': "Topics", @@ -213,7 +213,7 @@ #html_search_scorer = 'scorer.js' # Output file base name for HTML help builder. -htmlhelp_basename = 'dasheddoc' +htmlhelp_basename = 'caraveldoc' # -- Options for LaTeX output --------------------------------------------- @@ -235,7 +235,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'dashed.tex', u'Dashed Documentation', + (master_doc, 'caravel.tex', u'Caravel Documentation', u'Maxime Beauchemin', 'manual'), ] @@ -265,7 +265,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'Dashed', u'dashed Documentation', + (master_doc, 'Caravel', u'caravel Documentation', [author], 1) ] @@ -279,8 +279,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'Dashed', u'Dashed Documentation', - author, 'Dashed', 'One line description of project.', + (master_doc, 'Caravel', u'Caravel Documentation', + author, 'Caravel', 'One line description of project.', 'Miscellaneous'), ] diff --git a/docs/index.rst b/docs/index.rst index 037db7904c590..1008b7c227fb0 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ .. warning:: This project used to be name Panoramix and has been renamed - to Dashed in March 2016 + to Caravel in March 2016 Overview ======================================= diff --git a/docs/user_guide.rst b/docs/user_guide.rst index 9844300a6637e..20758ff5650e5 100644 --- a/docs/user_guide.rst +++ b/docs/user_guide.rst @@ -2,11 +2,11 @@ User Guide ========== The user guide is a collection of short videos showing different aspect -of Dashed. +of Caravel. Quick Intro ''''''''''' -This video demonstrates how Dashed works at a high level, it shows how +This video demonstrates how Caravel works at a high level, it shows how to navigate through datasets and dashboards that are already available. .. youtube:: https://www.youtube.com/watch?v=3Txm_nj_R7M @@ -41,7 +41,7 @@ to toggle them on dashboards. Adding a Table '''''''''''''' -This videos shows you how to expose a new table in Dashed, and how to +This videos shows you how to expose a new table in Caravel, and how to define the semantics on how this can be accessed by others in the ``Explore`` and ``Dashboard`` views. diff --git a/run_tests.sh b/run_tests.sh index f04fa0a1b63c2..5fb6ab7f4a745 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -rm /tmp/dashed_unittests.db -export DASHED_CONFIG=tests.dashed_test_config -dashed/bin/dashed db upgrade +rm /tmp/caravel_unittests.db +export CARAVEL_CONFIG=tests.caravel_test_config +caravel/bin/caravel db upgrade python setup.py nosetests diff --git a/setup.cfg b/setup.cfg index fefdc5c89f5d3..e59395f2e9f32 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = Dashed +name = Caravel summary = a data exploration platform description-file = README.md author = Maxime Beauchemin @@ -7,7 +7,7 @@ author-email = maximebeauchemin@gmail.com license = Apache License, Version 2.0 [files] -packages = dashed +packages = caravel [build_sphinx] source-dir = docs/ @@ -21,4 +21,4 @@ upload-dir = docs/_build/html verbosity=1 detailed-errors=1 with-coverage=1 -cover-package=dashed +cover-package=caravel diff --git a/setup.py b/setup.py index 90a252dfeeff7..f5055fe9b7860 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ version = '0.8.4' setup( - name='dashed', + name='caravel', description=( "A interactive data visualization platform build on SqlAlchemy " "and druid.io"), @@ -11,7 +11,7 @@ packages=find_packages(), include_package_data=True, zip_safe=False, - scripts=['dashed/bin/dashed'], + scripts=['caravel/bin/caravel'], install_requires=[ 'alembic>=0.8.5, <0.9.0', 'cryptography>=1.1.1, <2.0.0', @@ -38,7 +38,7 @@ tests_require=['coverage'], author='Maxime Beauchemin', author_email='maximebeauchemin@gmail.com', - url='https://github.com/airbnb/dashed', + url='https://github.com/airbnb/caravel', download_url=( - 'https://github.com/airbnb/dashed/tarball/' + version), + 'https://github.com/airbnb/caravel/tarball/' + version), ) diff --git a/tests/caravel_test_config.py b/tests/caravel_test_config.py index f61541e88f63a..14d9ef75fd084 100644 --- a/tests/caravel_test_config.py +++ b/tests/caravel_test_config.py @@ -1,6 +1,6 @@ -from dashed.config import * +from caravel.config import * AUTH_USER_REGISTRATION_ROLE = 'alpha' -SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/dashed_unittests.db' +SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/caravel_unittests.db' DEBUG = True -DASHED_WEBSERVER_PORT = 8081 +CARAVEL_WEBSERVER_PORT = 8081 diff --git a/tests/core_tests.py b/tests/core_tests.py index 41cf79c9ef57c..dc35f6e28b8f6 100644 --- a/tests/core_tests.py +++ b/tests/core_tests.py @@ -2,13 +2,13 @@ import doctest import os import unittest -os.environ['DASHED_CONFIG'] = 'tests.dashed_test_config' +os.environ['CARAVEL_CONFIG'] = 'tests.caravel_test_config' from flask.ext.testing import LiveServerTestCase, TestCase -import dashed -from dashed import app, db, models, utils +import caravel +from caravel import app, db, models, utils BASE_DIR = app.config.get("BASE_DIR") -cli = imp.load_source('cli', BASE_DIR + "/bin/dashed") +cli = imp.load_source('cli', BASE_DIR + "/bin/caravel") class LiveTest(TestCase): @@ -22,7 +22,7 @@ def setUp(self): pass def test_init(self): - utils.init(dashed) + utils.init(caravel) def test_load_examples(self): cli.load_examples(sample=True) @@ -39,7 +39,7 @@ def test_slices(self): self.client.get(viz.get_json()) def test_csv(self): - self.client.get('/dashed/explore/table/1/?viz_type=table&granularity=ds&since=100+years&until=now&metrics=count&groupby=name&limit=50&show_brush=y&show_brush=false&show_legend=y&show_brush=false&rich_tooltip=y&show_brush=false&show_brush=false&show_brush=false&show_brush=false&y_axis_format=&x_axis_showminmax=y&show_brush=false&line_interpolation=linear&rolling_type=None&rolling_periods=&time_compare=&num_period_compare=&where=&having=&flt_col_0=gender&flt_op_0=in&flt_eq_0=&flt_col_0=gender&flt_op_0=in&flt_eq_0=&slice_id=14&slice_name=Boys&collapsed_fieldsets=&action=&datasource_name=birth_names&datasource_id=1&datasource_type=table&previous_viz_type=line&csv=true') + self.client.get('/caravel/explore/table/1/?viz_type=table&granularity=ds&since=100+years&until=now&metrics=count&groupby=name&limit=50&show_brush=y&show_brush=false&show_legend=y&show_brush=false&rich_tooltip=y&show_brush=false&show_brush=false&show_brush=false&show_brush=false&y_axis_format=&x_axis_showminmax=y&show_brush=false&line_interpolation=linear&rolling_type=None&rolling_periods=&time_compare=&num_period_compare=&where=&having=&flt_col_0=gender&flt_op_0=in&flt_eq_0=&flt_col_0=gender&flt_op_0=in&flt_eq_0=&slice_id=14&slice_name=Boys&collapsed_fieldsets=&action=&datasource_name=birth_names&datasource_id=1&datasource_type=table&previous_viz_type=line&csv=true') def test_dashboard(self): for dash in db.session.query(models.Dashboard).all(): diff --git a/tests/panoramix_test_config.py b/tests/panoramix_test_config.py index ca643d5fba505..dea0733b2e221 100644 --- a/tests/panoramix_test_config.py +++ b/tests/panoramix_test_config.py @@ -1,4 +1,4 @@ -from dashed.config import * +from caravel.config import * AUTH_USER_REGISTRATION_ROLE = 'alpha' SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/panoramix_unittests.db'