Merge pull request #193 from nk9/full-upgrade

Full upgrade of dependent libraries

app/__init__.py

@@ -7,16 +7,16 @@
 from flask_mail import Mail
 from flask_rq import RQ
 from flask_sqlalchemy import SQLAlchemy
-from flask_wtf import CsrfProtect
+from flask_wtf import CSRFProtect
 
 from app.assets import app_css, app_js, vendor_css, vendor_js
-from config import config
+from config import config as Config
 
 basedir = os.path.abspath(os.path.dirname(__file__))
 
 mail = Mail()
 db = SQLAlchemy()
-csrf = CsrfProtect()
+csrf = CSRFProtect()
 compress = Compress()
 
 # Set up Flask-Login
@@ -25,13 +25,18 @@
 login_manager.login_view = 'account.login'
 
 
-def create_app(config_name):
+def create_app(config):
     app = Flask(__name__)
-    app.config.from_object(config[config_name])
+    config_name = config
+
+    if not isinstance(config, str):
+        config_name = os.getenv('FLASK_CONFIG', 'default')
+
+    app.config.from_object(Config[config_name])
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     # not using sqlalchemy event system, hence disabling it
 
-    config[config_name].init_app(app)
+    Config[config_name].init_app(app)
 
     # Set up extensions
     mail.init_app(app)

app/account/forms.py

@@ -1,5 +1,5 @@
 from flask import url_for
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import ValidationError
 from wtforms.fields import (
     BooleanField,
@@ -13,7 +13,7 @@
 from app.models import User
 
 
-class LoginForm(Form):
+class LoginForm(FlaskForm):
     email = EmailField(
         'Email', validators=[InputRequired(),
                              Length(1, 64),
@@ -23,7 +23,7 @@ class LoginForm(Form):
     submit = SubmitField('Log in')
 
 
-class RegistrationForm(Form):
+class RegistrationForm(FlaskForm):
     first_name = StringField(
         'First name', validators=[InputRequired(),
                                   Length(1, 64)])
@@ -50,7 +50,7 @@ def validate_email(self, field):
                                     url_for('account.login')))
 
 
-class RequestResetPasswordForm(Form):
+class RequestResetPasswordForm(FlaskForm):
     email = EmailField(
         'Email', validators=[InputRequired(),
                              Length(1, 64),
@@ -61,7 +61,7 @@ class RequestResetPasswordForm(Form):
     # that an account with the given email exists.
 
 
-class ResetPasswordForm(Form):
+class ResetPasswordForm(FlaskForm):
     email = EmailField(
         'Email', validators=[InputRequired(),
                              Length(1, 64),
@@ -81,7 +81,7 @@ def validate_email(self, field):
             raise ValidationError('Unknown email address.')
 
 
-class CreatePasswordForm(Form):
+class CreatePasswordForm(FlaskForm):
     password = PasswordField(
         'Password',
         validators=[
@@ -93,7 +93,7 @@ class CreatePasswordForm(Form):
     submit = SubmitField('Set password')
 
 
-class ChangePasswordForm(Form):
+class ChangePasswordForm(FlaskForm):
     old_password = PasswordField('Old password', validators=[InputRequired()])
     new_password = PasswordField(
         'New password',
@@ -106,7 +106,7 @@ class ChangePasswordForm(Form):
     submit = SubmitField('Update password')
 
 
-class ChangeEmailForm(Form):
+class ChangeEmailForm(FlaskForm):
     email = EmailField(
         'New email', validators=[InputRequired(),
                                  Length(1, 64),

app/admin/forms.py

@@ -1,4 +1,4 @@
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import ValidationError
 from wtforms.ext.sqlalchemy.fields import QuerySelectField
 from wtforms.fields import (
@@ -18,7 +18,7 @@
 from app.models import Role, User
 
 
-class ChangeUserEmailForm(Form):
+class ChangeUserEmailForm(FlaskForm):
     email = EmailField(
         'New email', validators=[InputRequired(),
                                  Length(1, 64),
@@ -30,7 +30,7 @@ def validate_email(self, field):
             raise ValidationError('Email already registered.')
 
 
-class ChangeAccountTypeForm(Form):
+class ChangeAccountTypeForm(FlaskForm):
     role = QuerySelectField(
         'New account type',
         validators=[InputRequired()],
@@ -39,7 +39,7 @@ class ChangeAccountTypeForm(Form):
     submit = SubmitField('Update role')
 
 
-class InviteUserForm(Form):
+class InviteUserForm(FlaskForm):
     role = QuerySelectField(
         'Account type',
         validators=[InputRequired()],

requirements.txt

@@ -1,38 +1,45 @@
-alembic==0.8.10
-appdirs==1.4.0
-blinker==1.3
-click==6.7
-Faker==0.7.7
-Flask==0.12
+alembic==1.1.0
+appdirs==1.4.3
+attrs==19.1.0
+blinker==1.4
+certifi==2019.6.16
+chardet==3.0.4
+Click==7.0
+Faker==2.0.1
+Flask==1.1.1
 Flask-Assets==0.12
 Flask-Compress==1.4.0
-Flask-Login==0.4.0
+Flask-Login==0.4.1
 Flask-Mail==0.9.1
-Flask-Migrate==2.0.3
+Flask-Migrate==2.5.2
 Flask-RQ==0.2
-Flask-Script==2.0.5
-Flask-SQLAlchemy==2.1
+Flask-Script==2.0.6
+Flask-SQLAlchemy==2.4.0
 Flask-SSLify==0.1.5
-Flask-WTF==0.11
-gunicorn==19.6.0
-honcho==0.7.1
-itsdangerous==0.24
-Jinja2==2.9.5
-jsmin==2.2.1
-jsonpickle==0.9.2
-Mako==1.0.6
-MarkupSafe==0.23
-packaging==16.8
-psycopg2==2.7
-pyparsing==2.1.10
-python-dateutil==2.6.0
-python-editor==1.0.3
-raygun4py==3.1.4
-redis==2.10.5
-requests==2.9.1
-rq==0.7.1
-six==1.10.0
-SQLAlchemy==1.1.5
+Flask-WTF==0.14.2
+gunicorn==19.9.0
+honcho==1.0.1
+idna==2.8
+itsdangerous==1.1.0
+Jinja2==2.10.1
+jsmin==2.2.2
+jsonpickle==1.2
+Mako==1.1.0
+MarkupSafe==1.1.1
+packaging==19.1
+pipupgrade==1.5.1
+psycopg2==2.8.3
+pyparsing==2.4.2
+python-dateutil==2.8.0
+python-editor==1.0.4
+raygun4py==4.3.0
+redis==3.3.8
+requests==2.22.0
+rq==1.1.0
+six==1.12.0
+SQLAlchemy==1.3.8
+text-unidecode==1.2
+urllib3==1.25.3
 webassets==0.12.1
-Werkzeug==0.11.15
-WTForms==2.1
+Werkzeug==0.15.5
+WTForms==2.2.1