pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping FAB and cryptography to current version (#647)

This commit is contained in:
Maxime Beauchemin 2016-06-20 15:31:15 -07:00 committed by GitHub
parent 54e4be1d13
commit d71a67cdad
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caravel/bin/caravel
View File

@ -9,8 +9,8 @@ from datetime import datetime
from subprocess import Popen from subprocess import Popen
import textwrap import textwrap
from flask.ext.migrate import MigrateCommand from flask_migrate import MigrateCommand
from flask.ext.script import Manager from flask_script import Manager
import caravel import caravel
from caravel import app, ascii_art, db, data, utils from caravel import app, ascii_art, db, data, utils

30
caravel/views.py
View File

@ -329,10 +329,10 @@ class DatabaseView(CaravelModelView, DeleteMixin): # noqa
appbuilder.add_view( appbuilder.add_view(
DatabaseView, DatabaseView,
"Databases", "Databases",
label=_("Databases"), label=__("Databases"),
icon="fa-database", icon="fa-database",
category="Sources", category="Sources",
category_label=_("Sources"), category_label=__("Sources"),
category_icon='fa-database',) category_icon='fa-database',)
@ -389,9 +389,9 @@ class TableModelView(CaravelModelView, DeleteMixin): # noqa
appbuilder.add_view( appbuilder.add_view(
TableModelView, TableModelView,
"Tables", "Tables",
label=_("Tables"), label=__("Tables"),
category="Sources", category="Sources",
category_label=_("Sources"), category_label=__("Sources"),
icon='fa-table',) icon='fa-table',)
@ -422,10 +422,10 @@ if config['DRUID_IS_ACTIVE']:
appbuilder.add_view( appbuilder.add_view(
DruidClusterModelView, DruidClusterModelView,
name="Druid Clusters", name="Druid Clusters",
label=_("Druid Clusters"), label=__("Druid Clusters"),
icon="fa-cubes", icon="fa-cubes",
category="Sources", category="Sources",
category_label=_("Sources"), category_label=__("Sources"),
category_icon='fa-database',) category_icon='fa-database',)
@ -483,7 +483,7 @@ class SliceModelView(CaravelModelView, DeleteMixin): # noqa
appbuilder.add_view( appbuilder.add_view(
SliceModelView, SliceModelView,
"Slices", "Slices",
label=_("Slices"), label=__("Slices"),
icon="fa-bar-chart", icon="fa-bar-chart",
category="", category="",
category_icon='',) category_icon='',)
@ -557,7 +557,7 @@ class DashboardModelView(CaravelModelView, DeleteMixin): # noqa
appbuilder.add_view( appbuilder.add_view(
DashboardModelView, DashboardModelView,
"Dashboards", "Dashboards",
label=_("Dashboards"), label=__("Dashboards"),
icon="fa-dashboard", icon="fa-dashboard",
category="", category="",
category_icon='',) category_icon='',)
@ -587,9 +587,9 @@ class LogModelView(CaravelModelView):
appbuilder.add_view( appbuilder.add_view(
LogModelView, LogModelView,
"Action Log", "Action Log",
label=_("Action Log"), label=__("Action Log"),
category="Security", category="Security",
category_label=_("Security"), category_label=__("Security"),
icon="fa-list-ol") icon="fa-list-ol")
@ -634,9 +634,9 @@ if config['DRUID_IS_ACTIVE']:
appbuilder.add_view( appbuilder.add_view(
DruidDatasourceModelView, DruidDatasourceModelView,
"Druid Datasources", "Druid Datasources",
label=_("Druid Datasources"), label=__("Druid Datasources"),
category="Sources", category="Sources",
category_label=_("Sources"), category_label=__("Sources"),
icon="fa-cube") icon="fa-cube")
@ -1146,7 +1146,7 @@ if config['DRUID_IS_ACTIVE']:
"Refresh Druid Metadata", "Refresh Druid Metadata",
href='/caravel/refresh_datasources/', href='/caravel/refresh_datasources/',
category='Sources', category='Sources',
category_label=_("Sources"), category_label=__("Sources"),
category_icon='fa-database', category_icon='fa-database',
icon="fa-cog") icon="fa-cog")
@ -1161,10 +1161,10 @@ appbuilder.add_separator("Sources")
appbuilder.add_view( appbuilder.add_view(
CssTemplateModelView, CssTemplateModelView,
"CSS Templates", "CSS Templates",
label=_("CSS Templates"), label=__("CSS Templates"),
icon="fa-css3", icon="fa-css3",
category="Sources", category="Sources",
category_label=_("Sources"), category_label=__("Sources"),
category_icon='') category_icon='')

4
setup.py
View File

@ -17,8 +17,8 @@ setup(
scripts=['caravel/bin/caravel'], scripts=['caravel/bin/caravel'],
install_requires=[ install_requires=[
'babel==2.3.4', 'babel==2.3.4',
'cryptography==1.1.1', 'cryptography==1.4',
'flask-appbuilder==1.7.1', 'flask-appbuilder==1.8.1',
'Flask-BabelPkg==0.9.6', 'Flask-BabelPkg==0.9.6',
'flask-cache==0.13.1', 'flask-cache==0.13.1',
'flask-migrate==1.5.1', 'flask-migrate==1.5.1',