Upgraded Flask-based dependencies.

ffdnispdb/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from flask import Flask, g, current_app, request
-from flask.ext.babel import Babel
-from flask.ext.sqlalchemy import SQLAlchemy, event
-from flask.ext.mail import Mail
-from flask.ext.cache import Cache
+from flask_babel import Babel
+from flask_sqlalchemy import SQLAlchemy, event
+from flask_mail import Mail
+from flask_cache import Cache
 from .sessions import MySessionInterface
 
 

ffdnispdb/constants.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from flask.ext.babel import lazy_gettext as _
+from flask_babel import lazy_gettext as _
 
 STEPS = {
     1: _('Project considered'),

ffdnispdb/cron_task.py

@@ -4,7 +4,7 @@
 import signal
 import traceback
 from datetime import datetime, timedelta
-from flask.ext.mail import Message
+from flask_mail import Message
 from flask import url_for
 import itsdangerous
 

ffdnispdb/forms.py

@@ -4,7 +4,7 @@ import urllib.parse
 import json
 import collections
 from flask import current_app
-from flask.ext.wtf import Form
+from flask_wtf import Form
 from wtforms import Form as InsecureForm
 from wtforms import (TextField, DateField, DecimalField, IntegerField,
                      SelectField, SelectMultipleField, FieldList, FormField)
@@ -12,7 +12,7 @@ from wtforms.widgets import (TextInput, ListWidget, html_params, HTMLString,
                              CheckboxInput, Select, TextArea)
 from wtforms.validators import (DataRequired, Optional, URL, Email, Length,
                                 NumberRange, ValidationError, StopValidation)
-from flask.ext.babel import lazy_gettext as _, gettext
+from flask_babel import lazy_gettext as _, gettext
 from babel.support import LazyProxy
 from ispformat.validator import validate_geojson
 from .constants import STEPS

ffdnispdb/models.py

@@ -297,4 +297,4 @@ class ISPWhoosh(object):
 
 
 flask_sqlalchemy.models_committed.connect(ISPWhoosh._after_flush)
-event.listen(flask_sqlalchemy.Session, 'before_commit', pre_save_hook)
+event.listen(flask_sqlalchemy.SignallingSession, 'before_commit', pre_save_hook)

ffdnispdb/views.py

@@ -3,8 +3,8 @@
 from flask import request, redirect, url_for, abort, \
     render_template, flash, json, session, Response, Markup, \
     current_app, Blueprint
-from flask.ext.babel import gettext as _, get_locale
-from flask.ext.mail import Message
+from flask_babel import gettext as _, get_locale
+from flask_mail import Message
 from sqlalchemy.sql import func, asc
 import itsdangerous
 import docutils.core

manage.py

@@ -8,7 +8,7 @@ from werkzeug.debug import DebuggedApplication
 
 import os; os.environ.setdefault('FFDNISPDB_SETTINGS', '../settings_dev.py')
 import sys
-from flask.ext.script import (Shell, Server, Manager, Command, Option,
+from flask_script import (Shell, Server, Manager, Command, Option,
                               prompt, prompt_bool, prompt_pass)
 import ffdnispdb
 

requirements.txt

@@ -1,27 +1,28 @@
-SQLAlchemy>=0.8.4,<0.9
-Flask==0.10.1
-Flask-Babel==0.9
-Flask-SQLAlchemy>=1.0,<2.0
-Flask-WTF==0.9.4
-Flask-Mail==0.9.0
-Flask-Cache==0.12
-Jinja2==2.7.1
-MarkupSafe==0.18
-Werkzeug==0.9.4
-argparse==1.2.1
-itsdangerous>=0.23
-blinker==1.3
+SQLAlchemy>0.8.4
+Flask>0.10.1
+Flask-Babel>0.9
+Flask-SQLAlchemy>=1.0
+Flask-WTF>0.9.4
+Flask-Mail>0.9.0
+Flask-Cache>0.12
+wtforms>2.0
+Jinja2>2.7.1
+MarkupSafe>0.18
+Werkzeug>0.9.4
+argparse>1.2.1
+itsdangerous>0.23
+blinker>1.3
 GeoAlchemy2>=0.4.0
 gevent>=1.0.2,<1.2
 jsonschema>=2.3.0
 requests>=2.1.0
 # ndg & pyasn required for SNI
 -e git+https://code.ffdn.org/FFDN/ndg_httpsclient.git#egg=ndg-httpsclient
-pyasn1>=0.1.7
-docutils>=0.11
+pyasn1>0.1.7
+docutils>0.11
 # full-text search
-Whoosh>=2.5.6
+Whoosh>2.5.6
 # manage.py
-Flask-Script==0.6.6
+Flask-Script>0.6.6
 # isp format
 -e git+https://code.ffdn.org/ffdn/isp-format.git#egg=isp-format

settings_dev.py

@@ -5,3 +5,4 @@ EMAIL_SENDER='FFDN DB <no-reply@db.ffdn.org>'
 #SERVER_NAME = 'db.ffdn.org'
 DEBUG = True
 SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
+SQLALCHEMY_TRACK_MODIFICATIONS = True

settings_prod.py.dist

@@ -6,3 +6,4 @@ EMAIL_SENDER='FFDN DB <no-reply@db.ffdn.org>'
 DEBUG = False
 SECRET_KEY = None # Generate one
 ADMINS = ('your@email.com',)
+SQLALCHEMY_TRACK_MODIFICATIONS = True

test_ffdnispdb.py

@@ -2,7 +2,7 @@
 from ffdnispdb import create_app, db, utils
 from ffdnispdb.models import ISP, CoveredArea
 from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 import unittest
 import doctest
 import json