Merge branch 'master' of github.com:realpython/flask-skeleton

Author: mjhea0

.python-version

@@ -1 +1 @@
-3.5.0
+3.5.2

manage.py

@@ -5,8 +5,8 @@
 import unittest
 import coverage
 
-from flask.ext.script import Manager
-from flask.ext.migrate import Migrate, MigrateCommand
+from flask_script import Manager
+from flask_migrate import Migrate, MigrateCommand
 
 COV = coverage.coverage(
     branch=True,

project/server/__init__.py

@@ -8,11 +8,11 @@
 import os
 
 from flask import Flask, render_template
-from flask.ext.login import LoginManager
-from flask.ext.bcrypt import Bcrypt
-from flask.ext.debugtoolbar import DebugToolbarExtension
+from flask_login import LoginManager
+from flask_bcrypt import Bcrypt
+from flask_debugtoolbar import DebugToolbarExtension
 from flask_bootstrap import Bootstrap
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
 
 ################

project/server/user/views.py

@@ -7,7 +7,7 @@
 
 from flask import render_template, Blueprint, url_for, \
     redirect, flash, request
-from flask.ext.login import login_user, logout_user, login_required
+from flask_login import login_user, logout_user, login_required
 
 from project.server import bcrypt, db
 from project.server.models import User

project/tests/base.py

@@ -1,7 +1,7 @@
 # project/server/tests/base.py
 
 
-from flask.ext.testing import TestCase
+from flask_testing import TestCase
 
 from project.server import app, db
 from project.server.models import User

project/tests/test__config.py

@@ -4,7 +4,7 @@
 import unittest
 
 from flask import current_app
-from flask.ext.testing import TestCase
+from flask_testing import TestCase
 
 from project.server import app
 

project/tests/test_user.py

@@ -4,7 +4,7 @@
 import datetime
 import unittest
 
-from flask.ext.login import current_user
+from flask_login import current_user
 
 from base import BaseTestCase
 from project.server import bcrypt

requirements.txt

@@ -1,27 +1,28 @@
-alembic==0.8.4
-bcrypt==2.0.0
+alembic==0.8.6
+bcrypt==3.1.0
 blinker==1.4
-cffi==1.4.2
-coverage==4.0.3
-dominate==2.1.16
-Flask==0.10.1
+cffi==1.7.0
+click==6.6
+coverage==4.1
+dominate==2.2.1
+Flask==0.11.1
 Flask-Bcrypt==0.7.1
-Flask-Bootstrap==3.3.5.7
+Flask-Bootstrap==3.3.6.0
 Flask-DebugToolbar==0.10.0
 Flask-Login==0.3.2
-Flask-Migrate==1.6.0
+Flask-Migrate==1.8.1
 Flask-Script==2.0.5
 Flask-SQLAlchemy==2.1
-Flask-Testing==0.4.2
+Flask-Testing==0.5.0
 Flask-WTF==0.12
 itsdangerous==0.24
 Jinja2==2.8
-Mako==1.0.3
+Mako==1.0.4
 MarkupSafe==0.23
 pycparser==2.14
-python-editor==0.5
+python-editor==1.0.1
 six==1.10.0
-SQLAlchemy==1.0.11
-visitor==0.1.2
-Werkzeug==0.11.3
+SQLAlchemy==1.0.14
+visitor==0.1.3
+Werkzeug==0.11.10
 WTForms==2.1