From 6cfb2f43a4fcf0488899cb4f25bf9bdc2b49bf25 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Oct 08 2014 14:15:39 +0000
Subject: changing flask-admin imports to get rid of warnings. Fixes T348


Summary: changing flask-admin imports to remove warnings at every sync and execution. updating requirements.txt to reflect current epel6 dep versions.

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D242

---

diff --git a/blockerbugs/controllers/admin/auth.py b/blockerbugs/controllers/admin/auth.py
index 8816a72..f364c62 100644
--- a/blockerbugs/controllers/admin/auth.py
+++ b/blockerbugs/controllers/admin/auth.py
@@ -20,11 +20,11 @@
 # Authors:
 #   Tim Flink <tflink@redhat.com>
 #   Ilgiz Islamgulov <ilgizisl@gmail.com>
-from flask.ext.admin.contrib import sqlamodel
+from flask.ext.admin.contrib import sqla
 
 from blockerbugs.controllers.users import check_admin_rights
 
 
-class FasAuthModelView(sqlamodel.ModelView):
+class FasAuthModelView(sqla.ModelView):
     def _handle_view(self, name, **kwargs):
-        return check_admin_rights()
\ No newline at end of file
+        return check_admin_rights()
diff --git a/blockerbugs/controllers/admin/build.py b/blockerbugs/controllers/admin/build.py
index c61b0fe..2faaf2d 100644
--- a/blockerbugs/controllers/admin/build.py
+++ b/blockerbugs/controllers/admin/build.py
@@ -25,7 +25,7 @@ from flask import flash, request, url_for, redirect
 from flask.ext import wtf
 from flask.ext.admin import expose
 from flask.ext.admin.babel import gettext
-from flask.ext.admin.contrib.sqlamodel.fields import QuerySelectMultipleField
+from flask.ext.admin.contrib.sqla.fields import QuerySelectMultipleField
 from flask.ext.admin.form import Select2Widget
 
 from blockerbugs.controllers.admin.auth import FasAuthModelView
diff --git a/blockerbugs/controllers/admin/spin.py b/blockerbugs/controllers/admin/spin.py
index 9ec9c67..514504a 100644
--- a/blockerbugs/controllers/admin/spin.py
+++ b/blockerbugs/controllers/admin/spin.py
@@ -28,8 +28,8 @@ from flask import request, url_for, flash, redirect
 from flask.ext import wtf
 from flask.ext.admin import expose
 from flask.ext.admin.babel import gettext
-from flask.ext.admin.contrib.sqlamodel.filters import BaseSQLAFilter, FilterConverter
-from flask.ext.admin.contrib.sqlamodel.form import AdminModelConverter
+from flask.ext.admin.contrib.sqla.filters import BaseSQLAFilter, FilterConverter
+from flask.ext.admin.contrib.sqla.form import AdminModelConverter
 from flask.ext.admin.form import Select2Field
 from flask.ext.admin.model import filters
 from flask.ext.admin.model.form import converts
diff --git a/requirements.txt b/requirements.txt
index 2771e3f..c071612 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ Flask==0.9
 Flask-SQLAlchemy==0.16
 Flask-WTF==0.8
 Jinja2==2.6
-SQLAlchemy==0.7.8
+SQLAlchemy==0.8.2
 WTAlchemy==0.1b3
 WTForms==1.0.2
 Werkzeug==0.8.3
@@ -20,7 +20,7 @@ pycurl==7.19.0
 Flask-FAS>=0.1.0
 dingus==0.3.4
 alembic==0.5.0
-flask-admin==1.0.5
+Flask-Admin==1.0.8
 iso8601==0.1.4
 Flask-Assets==0.8
 cssmin==0.1.4