ajustes no test e atualização de dependências

opac/manager.py

@@ -29,8 +29,8 @@
 from opac_schema.v1.models import Collection, Sponsor, Journal, Issue, Article
 from webapp import controllers
 from webapp.utils import reset_db, create_db_tables, create_user, create_image
-from flask.ext.script import Manager, Shell
-from flask.ext.migrate import Migrate, MigrateCommand
+from flask_script import Manager, Shell
+from flask_migrate import Migrate, MigrateCommand
 from webapp.admin.forms import EmailForm
 from flask import current_app
 

opac/tests/base.py

@@ -10,7 +10,7 @@
 import pymongo
 from opac_schema.v1 import models as schema_models
 from flask import current_app
-from flask.ext.testing import TestCase
+from flask_testing import TestCase
 from webapp import dbsql
 
 

opac/tests/test_admin_custom_filters.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 from base import BaseTestCase
-from flask.ext.admin.contrib.mongoengine.tools import parse_like_term
+from flask_admin.contrib.mongoengine.tools import parse_like_term
 from flask_babelex import lazy_gettext as __
 from uuid import uuid4
 from webapp.admin.custom_filters import (

opac/tests/test_admin_views.py

@@ -2,7 +2,7 @@
 
 import unittest
 import re
-from flask.ext.testing import TestCase
+from flask_testing import TestCase
 from flask import current_app, url_for, g
 from flask_admin.contrib.sqla import form as admin_form
 from flask_login import current_user, login_user

opac/tests/test_main_views.py

@@ -2,7 +2,7 @@
 import unittest
 import flask
 import warnings
-from flask.ext.testing import TestCase
+from flask_testing import TestCase
 from flask import url_for, request, g, current_app
 from webapp import create_app, dbsql, dbmongo
 

opac/webapp/__init__.py

@@ -2,7 +2,7 @@
 import os
 
 from flask import Flask
-from flask.ext.htmlmin import HTMLMIN
+from flask_htmlmin import HTMLMIN
 from flask_assets import Environment, Bundle
 from flask_mongoengine import MongoEngine
 from flask_login import LoginManager

opac/webapp/admin/custom_filters.py

@@ -1,11 +1,11 @@
 # coding: utf-8
 
-from flask.ext.admin.contrib.mongoengine.filters import (
+from flask_admin.contrib.mongoengine.filters import (
     FilterEqual, FilterNotEqual, FilterLike, FilterNotLike,
     FilterEmpty, FilterInList, FilterNotInList, FilterConverter)
-from flask.ext.admin.contrib.mongoengine.tools import parse_like_term
-from flask.ext.admin.model import filters
-from flask.ext.admin.contrib import sqla
+from flask_admin.contrib.mongoengine.tools import parse_like_term
+from flask_admin.model import filters
+from flask_admin.contrib import sqla
 from mongoengine import ReferenceField, EmbeddedDocumentField, ListField, StringField
 from mongoengine.queryset import Q
 from opac_schema.v1.models import Journal, Issue

opac/webapp/admin/views.py

@@ -17,8 +17,8 @@
 from flask_admin.model.form import InlineFormAdmin
 import flask_login as login
 from flask import url_for, redirect, request, flash, abort, current_app
-from flask.ext.admin.contrib import sqla, mongoengine
-from flask.ext.admin.contrib.mongoengine.tools import parse_like_term
+from flask_admin.contrib import sqla, mongoengine
+from flask_admin.contrib.mongoengine.tools import parse_like_term
 from mongoengine import StringField, EmailField, URLField, ReferenceField, EmbeddedDocumentField
 from mongoengine.base.datastructures import BaseList
 

opac/webapp/controllers.py

@@ -14,7 +14,7 @@
 from opac_schema.v1.models import Journal, Issue, Article, Collection, News, Pages
 from flask import current_app, url_for
 from flask_babelex import lazy_gettext as __
-from flask.ext.mongoengine import Pagination
+from flask_mongoengine import Pagination
 from webapp import dbsql
 from models import User
 from choices import INDEX_NAME

opac/webapp/main/views.py

@@ -28,7 +28,7 @@ def url_external(endpoint, **kwargs):
     return urljoin(request.url_root, url)
 
 
-@main.before_request
+@main.before_app_request
 def add_collection_to_g():
     if not hasattr(g, 'collection'):
         try:
@@ -515,7 +515,7 @@ def about_collection():
 
     context = {}
 
-    for page in g.collection.about:
+    for page in g.collection.get('about', []):
         if page.language == language:
             context = {'content': page.content}
 

opac/webapp/models.py

@@ -11,7 +11,7 @@
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy_utils.types.choice import ChoiceType
 from werkzeug.security import generate_password_hash, check_password_hash
-from flask.ext.login import UserMixin
+from flask_login import UserMixin
 from flask import current_app
 from webapp.utils import thumbgen_filename
 from . import dbsql as db

requirements.dev.txt

@@ -1,6 +1,4 @@
 Flask-DebugToolbar==0.10.0
-Flask-Testing==0.4.2
-mock==1.3.0
-coverage==4.0.3
-requests==2.9.1
--e git+https://github.com/scieloorg/[email protected]#egg=xylose
+Flask-Testing==0.5.0
+mock==2.0.0
+coverage==4.1

requirements.production.txt

@@ -1,3 +1,3 @@
 chaussette==1.3.0
-gevent==1.1.0
-gunicorn
+gevent==1.1.1
+gunicorn==19.6.0

requirements.txt

@@ -1,22 +1,22 @@
-Flask==0.10.1
+Flask==0.11.1
 mongoengine==0.10.0
-flask-mongoengine==0.7.4
+flask-mongoengine==0.7.5
 Flask-Assets==0.11
-jsmin==2.1.6
+jsmin==2.2.1
 cssmin==0.2.0
 webassets==0.11.1
-Flask-Admin==1.4.0
+Flask-Admin==1.4.2
 Flask-SQLAlchemy==2.1
-SQLAlchemy-Utils==0.32.1
-Flask-Security==1.7.4
+SQLAlchemy-Utils==0.32.9
+Flask-Security==1.7.5
 Flask-Login==0.3.2
 Flask-Script==2.0.5
 Flask-Mail==0.9.1
-Pillow==3.1.1
-Flask-BabelEx==0.9.2
-Flask-Migrate==1.7.0
+Pillow==3.3.0
+Flask-BabelEx==0.9.3
+Flask-Migrate==1.8.1
 unicodecsv==0.14.1
 feedparser==5.2.1
 -e git+https://[email protected]/scieloorg/[email protected]#egg=opac_schema
 # -e git+https://[email protected]/scieloorg/[email protected]#egg=opac
-Flask-HTMLmin==1.1
+Flask-HTMLmin==1.2