# HG changeset patch # User Ludovic Chabant # Date 1541299322 25200 # Node ID 0d699f04968c88589f73c96535a57e006b063a4e # Parent 97b1b46cc1564aa44e32c330f776f58b439bdbe9 cm: Update dependencies and fix imports of Flask plugins. diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/bcryptfallback.py --- a/piecrust/admin/bcryptfallback.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/bcryptfallback.py Sat Nov 03 19:42:02 2018 -0700 @@ -19,7 +19,7 @@ try: - from flask.ext.bcrypt import Bcrypt + from flask_bcrypt import Bcrypt except ImportError: print_warning = True diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/blueprint.py --- a/piecrust/admin/blueprint.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/blueprint.py Sat Nov 03 19:42:02 2018 -0700 @@ -8,7 +8,7 @@ # Prepare the Login extension. -from flask.ext.login import LoginManager, UserMixin # NOQA +from flask_login import LoginManager, UserMixin # NOQA class User(UserMixin): diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/views/create.py --- a/piecrust/admin/views/create.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/views/create.py Sat Nov 03 19:42:02 2018 -0700 @@ -1,7 +1,7 @@ import logging from flask import ( g, request, abort, render_template, url_for, redirect, flash) -from flask.ext.login import login_required +from flask_login import login_required from piecrust.page import Page from piecrust.sources.interfaces import IInteractiveSource from piecrust.uriutil import split_uri diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/views/dashboard.py --- a/piecrust/admin/views/dashboard.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/views/dashboard.py Sat Nov 03 19:42:02 2018 -0700 @@ -4,7 +4,7 @@ from flask import ( current_app, g, request, render_template, url_for, redirect) -from flask.ext.login import login_user, logout_user, login_required +from flask_login import login_user, logout_user, login_required from piecrust.sources.fs import FSContentSourceBase from piecrust.sources.interfaces import IInteractiveSource from piecrust.uriutil import split_uri diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/views/edit.py --- a/piecrust/admin/views/edit.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/views/edit.py Sat Nov 03 19:42:02 2018 -0700 @@ -3,7 +3,7 @@ from werkzeug.utils import secure_filename from flask import ( g, request, abort, render_template, url_for, redirect, flash) -from flask.ext.login import login_required +from flask_login import login_required from piecrust.data.assetor import Assetor from piecrust.serving.util import get_requested_page from ..blueprint import foodtruck_bp diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/views/menu.py --- a/piecrust/admin/views/menu.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/views/menu.py Sat Nov 03 19:42:02 2018 -0700 @@ -1,5 +1,5 @@ from flask import g, request, url_for -from flask.ext.login import current_user +from flask_login import current_user from piecrust.sources.interfaces import IInteractiveSource diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/views/preview.py --- a/piecrust/admin/views/preview.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/views/preview.py Sat Nov 03 19:42:02 2018 -0700 @@ -1,5 +1,5 @@ from flask import g, request, make_response -from flask.ext.login import login_required +from flask_login import login_required from piecrust.serving.server import PieCrustServer from ..blueprint import foodtruck_bp diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/views/publish.py --- a/piecrust/admin/views/publish.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/views/publish.py Sat Nov 03 19:42:02 2018 -0700 @@ -1,7 +1,7 @@ import copy import logging from flask import request, g, url_for, render_template, Response -from flask.ext.login import login_required +from flask_login import login_required from ..blueprint import foodtruck_bp from ..pubutil import PublishLogReader from ..views import with_menu_context diff -r 97b1b46cc156 -r 0d699f04968c piecrust/admin/views/sources.py --- a/piecrust/admin/views/sources.py Sun Jul 29 22:52:11 2018 -0700 +++ b/piecrust/admin/views/sources.py Sat Nov 03 19:42:02 2018 -0700 @@ -1,6 +1,6 @@ import re from flask import g, abort, render_template, url_for -from flask.ext.login import login_required +from flask_login import login_required from piecrust.data.paginator import Paginator from ..blueprint import foodtruck_bp from ..views import with_menu_context diff -r 97b1b46cc156 -r 0d699f04968c setup.py --- a/setup.py Sun Jul 29 22:52:11 2018 -0700 +++ b/setup.py Sat Nov 03 19:42:02 2018 -0700 @@ -152,31 +152,31 @@ install_requires = [ - 'colorama>=0.3.3', + 'colorama>=0.4.0', 'compressinja>=0.0.2', - 'beautifulsoup4>=4.6.0', - 'Flask>=0.10.1', + 'beautifulsoup4>=4.6.3', + 'Flask>=1.0.2', 'Flask-IndieAuth>=0.0.3.2', - 'Flask-Login>=0.3.2', + 'Flask-Login>=0.4.1', 'Inukshuk>=0.1.2', 'Jinja2>=2.10', - 'Markdown>=2.6.2', + 'Markdown>=3.0.1', 'MarkupSafe>=1.0', - 'mf2py>=1.0.5', - 'paramiko>=2.0.0', - 'Pillow>=4.3.0', - 'Pygments>=2.0.2', + 'mf2py>=1.1.2', + 'paramiko>=2.4.2', + 'Pillow>=5.3.0', + 'Pygments>=2.2.0', 'pystache>=0.5.4', - 'python-dateutil>=2.4.2', - 'PyYAML>=3.11', - 'repoze.lru>=0.6', - 'requests>=2.18.0', - 'smartypants>=1.8.6', + 'python-dateutil>=2.7.5', + 'PyYAML>=3.13', + 'repoze.lru>=0.7', + 'requests>=2.20.0', + 'smartypants>=2.0.1', 'strict-rfc3339>=0.5', - 'textile>=2.2.2', - 'Unidecode>=0.4.18', - 'watchdog>=0.8.3', - 'Werkzeug>=0.12.2' + 'textile>=3.0.3', + 'Unidecode>=1.0.22', + 'watchdog>=0.9.0', + 'Werkzeug>=0.14.1' ] tests_require = [ 'invoke>=0.21.0',