From 14ac25df38404fdc9b42f2c687eb2b89c2ff3df6 Mon Sep 17 00:00:00 2001 From: Herman Haggerty Date: Thu, 22 Mar 2018 00:51:23 -0700 Subject: [PATCH] Updated deprecated package names and updated requirements.txt --- flask_application/__init__.py | 8 ++-- flask_application/admin/controllers.py | 2 +- flask_application/models.py | 2 +- flask_application/script.py | 4 +- flask_application/tests/__init__.py | 2 +- flask_application/tests/script.py | 2 +- flask_application/users/controllers.py | 2 +- flask_application/users/models.py | 2 +- manage.py | 6 +-- requirements.txt | 59 +++++++++++++++----------- runtime.txt | 2 +- templates/security/_menu.html | 4 +- 12 files changed, 52 insertions(+), 43 deletions(-) diff --git a/flask_application/__init__.py b/flask_application/__init__.py index 30fa01d..e645421 100755 --- a/flask_application/__init__.py +++ b/flask_application/__init__.py @@ -58,7 +58,7 @@ Bootstrap(app) # Assets -from flask.ext.assets import Environment +from flask_assets import Environment assets = Environment(app) # Ensure output directory exists assets_output_dir = os.path.join(FLASK_APP_DIR, '..', 'static', 'gen') @@ -66,11 +66,11 @@ os.mkdir(assets_output_dir) # Email -from flask.ext.mail import Mail +from flask_mail import Mail app.mail = Mail(app) # Memcache -from flask.ext.cache import Cache +from flask_cache import Cache app.cache = Cache(app) # MongoEngine @@ -78,7 +78,7 @@ app.db = db app.db.init_app(app) -from flask.ext.security import Security, MongoEngineUserDatastore +from flask_security import Security, MongoEngineUserDatastore from flask_application.users.models import User, Role # Setup Flask-Security diff --git a/flask_application/admin/controllers.py b/flask_application/admin/controllers.py index dca7ade..588dbce 100644 --- a/flask_application/admin/controllers.py +++ b/flask_application/admin/controllers.py @@ -1,5 +1,5 @@ from flask import Blueprint -from flask.ext.security import roles_required, roles_accepted +from flask_security import roles_required, roles_accepted from flask_application.controllers import TemplateView diff --git a/flask_application/models.py b/flask_application/models.py index 125d499..80800fe 100644 --- a/flask_application/models.py +++ b/flask_application/models.py @@ -1,4 +1,4 @@ -from flask.ext.mongoengine import MongoEngine +from flask_mongoengine import MongoEngine db = MongoEngine() diff --git a/flask_application/script.py b/flask_application/script.py index b418b0e..524e2be 100644 --- a/flask_application/script.py +++ b/flask_application/script.py @@ -1,7 +1,7 @@ from flask import current_app -from flask.ext.script import Command -from flask.ext.security.confirmable import confirm_user +from flask_script import Command +from flask_security.confirmable import confirm_user from flask_application.models import FlaskDocument diff --git a/flask_application/tests/__init__.py b/flask_application/tests/__init__.py index e0b7323..c0c0f1a 100644 --- a/flask_application/tests/__init__.py +++ b/flask_application/tests/__init__.py @@ -1,6 +1,6 @@ from flask import current_app -from flask.ext.testing import TestCase +from flask_testing import TestCase from flask_application import app from flask_application.script import ResetDB, PopulateDB diff --git a/flask_application/tests/script.py b/flask_application/tests/script.py index 8ac3d99..aaa6408 100644 --- a/flask_application/tests/script.py +++ b/flask_application/tests/script.py @@ -1,7 +1,7 @@ import nose import sys -from flask.ext.script import Command +from flask_script import Command class RunTests(Command): diff --git a/flask_application/users/controllers.py b/flask_application/users/controllers.py index e5ef852..38448a6 100644 --- a/flask_application/users/controllers.py +++ b/flask_application/users/controllers.py @@ -1,6 +1,6 @@ from flask import Blueprint -from flask.ext.security import login_required +from flask_security import login_required from flask_application.controllers import TemplateView diff --git a/flask_application/users/models.py b/flask_application/users/models.py index d6e3791..39018ea 100644 --- a/flask_application/users/models.py +++ b/flask_application/users/models.py @@ -1,4 +1,4 @@ -from flask.ext.security import UserMixin, RoleMixin +from flask_security import UserMixin, RoleMixin from flask_application.models import db, FlaskDocument diff --git a/manage.py b/manage.py index 8745ce4..fdf00bc 100755 --- a/manage.py +++ b/manage.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from flask.ext.script import Manager -from flask.ext.script.commands import Server, Shell, ShowUrls, Clean -from flask.ext.security.script import CreateUserCommand, AddRoleCommand,\ +from flask_script import Manager +from flask_script.commands import Server, Shell, ShowUrls, Clean +from flask_security.script import CreateUserCommand, AddRoleCommand,\ RemoveRoleCommand, ActivateUserCommand, DeactivateUserCommand from flask_application import app diff --git a/requirements.txt b/requirements.txt index 2e41198..3d46c18 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,29 +1,38 @@ -Flask==0.10.1 -Flask-Assets==0.10 -Flask-Bootstrap==3.3.0.1 +Babel==2.5.3 +blinker==1.4 +click==6.7 +cssmin==0.2.0 +dominate==2.3.1 +flake8==3.5.0 +Flask==0.12.2 +Flask-Assets==0.12 +Flask-BabelEx==0.9.3 +Flask-Bootstrap==3.3.7.1 Flask-Cache==0.13.1 -Flask-Login==0.2.11 +Flask-Login==0.4.1 Flask-Mail==0.9.1 +flask-mongoengine==0.9.5 Flask-Principal==0.4.0 -Flask-Script==2.0.5 -Flask-Security==1.7.3 -Flask-Testing==0.4.2 -Flask-WTF==0.9.5 -Jinja2==2.7.3 -MarkupSafe==0.23 -WTForms==2.0.1 -Werkzeug==0.9.6 -blinker==1.3 -cssmin==0.2.0 -flake8==2.2.5 -flask-mongoengine==0.7.1 -gunicorn==19.1.1 +Flask-Script==2.0.6 +Flask-Security==3.0.0 +Flask-Testing==0.7.1 +Flask-WTF==0.14.2 +gunicorn==19.7.1 itsdangerous==0.24 -mccabe==0.2.1 -mongoengine==0.8.7 -nose==1.3.4 -passlib==1.6.2 -pep8==1.5.7 -pyflakes==0.8.1 -pymongo==2.7.2 -webassets==0.10.1 +Jinja2==2.10 +MarkupSafe==1.0 +mccabe==0.6.1 +mongoengine==0.15.0 +nose==1.3.7 +passlib==1.7.1 +pep8==1.7.1 +pycodestyle==2.3.1 +pyflakes==1.6.0 +pymongo==3.6.1 +pytz==2018.3 +six==1.11.0 +speaklater==1.3 +visitor==0.1.3 +webassets==0.12.1 +Werkzeug==0.14.1 +WTForms==2.1 diff --git a/runtime.txt b/runtime.txt index 4c741c9..be711af 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.4.1 \ No newline at end of file +python-3.6.3 \ No newline at end of file diff --git a/templates/security/_menu.html b/templates/security/_menu.html index 6aeb940..1fb55be 100755 --- a/templates/security/_menu.html +++ b/templates/security/_menu.html @@ -1,5 +1,5 @@