From 9eedeae4c59e09c749a6d3621812c950649a83b9 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 20 Jun 2016 10:00:11 -0700
Subject: [PATCH] Bumping FAB and cryptography to current version

---
 caravel/bin/caravel |  4 ++--
 caravel/views.py    | 30 +++++++++++++++---------------
 setup.py            |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/caravel/bin/caravel b/caravel/bin/caravel
index 83c6bb6071fcf..eacd6e15862e4 100755
--- a/caravel/bin/caravel
+++ b/caravel/bin/caravel
@@ -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
diff --git a/caravel/views.py b/caravel/views.py
index 9b5c87e80f296..52fdf38c43096 100644
--- a/caravel/views.py
+++ b/caravel/views.py
@@ -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',)
 
 
@@ -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',)
 
 
@@ -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',)
 
 
@@ -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='',)
@@ -557,7 +557,7 @@ def pre_update(self, obj):
 appbuilder.add_view(
     DashboardModelView,
     "Dashboards",
-    label=_("Dashboards"),
+    label=__("Dashboards"),
     icon="fa-dashboard",
     category="",
     category_icon='',)
@@ -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")
 
 
@@ -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")
 
 
@@ -1133,7 +1133,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")
 
@@ -1148,10 +1148,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='')
 
 
diff --git a/setup.py b/setup.py
index 1205a91301d81..479ae54aff00b 100644
--- a/setup.py
+++ b/setup.py
@@ -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',