Skip to content

Commit

Permalink
Bumping FAB and cryptography to current version (#647)
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch authored Jun 20, 2016
1 parent 54e4be1 commit d71a67c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions caravel/bin/caravel
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ from datetime import datetime
from subprocess import Popen
import textwrap

from flask.ext.migrate import MigrateCommand
from flask.ext.script import Manager
from flask_migrate import MigrateCommand
from flask_script import Manager

import caravel
from caravel import app, ascii_art, db, data, utils
Expand Down
30 changes: 15 additions & 15 deletions caravel/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,10 @@ def pre_update(self, db):
appbuilder.add_view(
DatabaseView,
"Databases",
label=_("Databases"),
label=__("Databases"),
icon="fa-database",
category="Sources",
category_label=_("Sources"),
category_label=__("Sources"),
category_icon='fa-database',)


Expand Down Expand Up @@ -389,9 +389,9 @@ def post_update(self, table):
appbuilder.add_view(
TableModelView,
"Tables",
label=_("Tables"),
label=__("Tables"),
category="Sources",
category_label=_("Sources"),
category_label=__("Sources"),
icon='fa-table',)


Expand Down Expand Up @@ -422,10 +422,10 @@ class DruidClusterModelView(CaravelModelView, DeleteMixin): # noqa
appbuilder.add_view(
DruidClusterModelView,
name="Druid Clusters",
label=_("Druid Clusters"),
label=__("Druid Clusters"),
icon="fa-cubes",
category="Sources",
category_label=_("Sources"),
category_label=__("Sources"),
category_icon='fa-database',)


Expand Down Expand Up @@ -483,7 +483,7 @@ def pre_delete(self, obj):
appbuilder.add_view(
SliceModelView,
"Slices",
label=_("Slices"),
label=__("Slices"),
icon="fa-bar-chart",
category="",
category_icon='',)
Expand Down Expand Up @@ -557,7 +557,7 @@ def pre_update(self, obj):
appbuilder.add_view(
DashboardModelView,
"Dashboards",
label=_("Dashboards"),
label=__("Dashboards"),
icon="fa-dashboard",
category="",
category_icon='',)
Expand Down Expand Up @@ -587,9 +587,9 @@ class LogModelView(CaravelModelView):
appbuilder.add_view(
LogModelView,
"Action Log",
label=_("Action Log"),
label=__("Action Log"),
category="Security",
category_label=_("Security"),
category_label=__("Security"),
icon="fa-list-ol")


Expand Down Expand Up @@ -634,9 +634,9 @@ def post_update(self, datasource):
appbuilder.add_view(
DruidDatasourceModelView,
"Druid Datasources",
label=_("Druid Datasources"),
label=__("Druid Datasources"),
category="Sources",
category_label=_("Sources"),
category_label=__("Sources"),
icon="fa-cube")


Expand Down Expand Up @@ -1146,7 +1146,7 @@ def welcome(self):
"Refresh Druid Metadata",
href='/caravel/refresh_datasources/',
category='Sources',
category_label=_("Sources"),
category_label=__("Sources"),
category_icon='fa-database',
icon="fa-cog")

Expand All @@ -1161,10 +1161,10 @@ class CssTemplateModelView(CaravelModelView, DeleteMixin):
appbuilder.add_view(
CssTemplateModelView,
"CSS Templates",
label=_("CSS Templates"),
label=__("CSS Templates"),
icon="fa-css3",
category="Sources",
category_label=_("Sources"),
category_label=__("Sources"),
category_icon='')


Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
scripts=['caravel/bin/caravel'],
install_requires=[
'babel==2.3.4',
'cryptography==1.1.1',
'flask-appbuilder==1.7.1',
'cryptography==1.4',
'flask-appbuilder==1.8.1',
'Flask-BabelPkg==0.9.6',
'flask-cache==0.13.1',
'flask-migrate==1.5.1',
Expand Down

1 comment on commit d71a67c

@dpgaspar
Copy link
Member

@dpgaspar dpgaspar commented on d71a67c Jun 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flask-AppBuilder no longer uses Flask-BabelPkg, it's now using plain Flask-Babel. You should change all you're imports regarding i18n (Babel) to flask_babel.

Please sign in to comment.