Merge pull request #60 from HeMan/blacked

Now complies with black.

Author: mjhea0

.travis.yml

@@ -13,6 +13,7 @@ services:
 env:
   global:
     - DOCKER_COMPOSE_VERSION=1.18.0
+    - BLACK_VERSION=18.9b0
 
 before_install:
   - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then bash docker-compose.sh; fi
@@ -23,8 +24,10 @@ install:
 
 before_script:
   - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then docker-compose up --build -d; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then pip install black==$BLACK_VERSION; fi
 
 script:
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then black --line-length 79 --check --diff .; fi
   - flake8 .
   - python manage.py cov
   - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then docker-compose run web python manage.py cov; fi

{{cookiecutter.app_slug}}/manage.py

@@ -18,12 +18,12 @@
 # code coverage
 COV = coverage.coverage(
     branch=True,
-    include='project/*',
+    include="project/*",
     omit=[
-        'project/tests/*',
-        'project/server/config.py',
-        'project/server/*/__init__.py'
-    ]
+        "project/tests/*",
+        "project/server/config.py",
+        "project/server/*/__init__.py",
+    ],
 )
 COV.start()
 
@@ -44,7 +44,7 @@ def drop_db():
 @cli.command()
 def create_admin():
     """Creates the admin user."""
-    db.session.add(User(email='[email protected]', password='admin', admin=True))
+    db.session.add(User(email="[email protected]", password="admin", admin=True))
     db.session.commit()
 
 
@@ -57,7 +57,7 @@ def create_data():
 @cli.command()
 def test():
     """Runs the unit tests without test coverage."""
-    tests = unittest.TestLoader().discover('project/tests', pattern='test*.py')
+    tests = unittest.TestLoader().discover("project/tests", pattern="test*.py")
     result = unittest.TextTestRunner(verbosity=2).run(tests)
     if result.wasSuccessful():
         sys.exit(0)
@@ -68,12 +68,12 @@ def test():
 @cli.command()
 def cov():
     """Runs the unit tests with coverage."""
-    tests = unittest.TestLoader().discover('project/tests')
+    tests = unittest.TestLoader().discover("project/tests")
     result = unittest.TextTestRunner(verbosity=2).run(tests)
     if result.wasSuccessful():
         COV.stop()
         COV.save()
-        print('Coverage Summary:')
+        print("Coverage Summary:")
         COV.report()
         COV.html_report()
         COV.erase()
@@ -85,8 +85,8 @@ def cov():
 @cli.command()
 def flake():
     """Runs flake8 on the project."""
-    subprocess.run(['flake8', 'project'])
+    subprocess.run(["flake8", "project"])
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     cli()

{{cookiecutter.app_slug}}/project/server/__init__.py

@@ -26,13 +26,14 @@ def create_app(script_info=None):
     # instantiate the app
     app = Flask(
         __name__,
-        template_folder='../client/templates',
-        static_folder='../client/static'
+        template_folder="../client/templates",
+        static_folder="../client/static",
     )
 
     # set config
     app_settings = os.getenv(
-        'APP_SETTINGS', 'project.server.config.DevelopmentConfig')
+        "APP_SETTINGS", "project.server.config.DevelopmentConfig"
+    )
     app.config.from_object(app_settings)
 
     # set up extensions
@@ -46,13 +47,15 @@ def create_app(script_info=None):
     # register blueprints
     from project.server.user.views import user_blueprint
     from project.server.main.views import main_blueprint
+
     app.register_blueprint(user_blueprint)
     app.register_blueprint(main_blueprint)
 
     # flask login
     from project.server.models import User
-    login_manager.login_view = 'user.login'
-    login_manager.login_message_category = 'danger'
+
+    login_manager.login_view = "user.login"
+    login_manager.login_message_category = "danger"
 
     @login_manager.user_loader
     def load_user(user_id):
@@ -61,23 +64,23 @@ def load_user(user_id):
     # error handlers
     @app.errorhandler(401)
     def unauthorized_page(error):
-        return render_template('errors/401.html'), 401
+        return render_template("errors/401.html"), 401
 
     @app.errorhandler(403)
     def forbidden_page(error):
-        return render_template('errors/403.html'), 403
+        return render_template("errors/403.html"), 403
 
     @app.errorhandler(404)
     def page_not_found(error):
-        return render_template('errors/404.html'), 404
+        return render_template("errors/404.html"), 404
 
     @app.errorhandler(500)
     def server_error_page(error):
-        return render_template('errors/500.html'), 500
+        return render_template("errors/500.html"), 500
 
     # shell context for flask cli
     @app.shell_context_processor
     def ctx():
-        return {'app': app, 'db': db}
+        return {"app": app, "db": db}
 
     return app

{{cookiecutter.app_slug}}/project/server/config.py

@@ -7,33 +7,37 @@
 
 class BaseConfig(object):
     """Base configuration."""
-    APP_NAME = os.getenv('APP_NAME', '{{cookiecutter.app_name}}')
+
+    APP_NAME = os.getenv("APP_NAME", "{{cookiecutter.app_name}}")
     BCRYPT_LOG_ROUNDS = 4
     DEBUG_TB_ENABLED = False
-    SECRET_KEY = os.getenv('SECRET_KEY', 'my_precious')
+    SECRET_KEY = os.getenv("SECRET_KEY", "my_precious")
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     WTF_CSRF_ENABLED = False
 
 
 class DevelopmentConfig(BaseConfig):
     """Development configuration."""
+
     DEBUG_TB_ENABLED = True
     DEBUG_TB_INTERCEPT_REDIRECTS = False
     SQLALCHEMY_DATABASE_URI = os.environ.get(
-        'DATABASE_URL',
-        'sqlite:///{0}'.format(os.path.join(basedir, 'dev.db')))
+        "DATABASE_URL", "sqlite:///{0}".format(os.path.join(basedir, "dev.db"))
+    )
 
 
 class TestingConfig(BaseConfig):
     """Testing configuration."""
+
     PRESERVE_CONTEXT_ON_EXCEPTION = False
-    SQLALCHEMY_DATABASE_URI = 'sqlite:///'
-    SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_TEST_URL', 'sqlite:///')
+    SQLALCHEMY_DATABASE_URI = "sqlite:///"
+    SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_TEST_URL", "sqlite:///")
     TESTING = True
 
 
 class ProductionConfig(BaseConfig):
     """Production configuration."""
+
     BCRYPT_LOG_ROUNDS = 13
-    SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL')
+    SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_URL")
     WTF_CSRF_ENABLED = True

{{cookiecutter.app_slug}}/project/server/main/views.py

@@ -4,12 +4,12 @@
 from flask import render_template, Blueprint
 
 
-main_blueprint = Blueprint('main', __name__,)
+main_blueprint = Blueprint("main", __name__)
 
 
-@main_blueprint.route('/')
+@main_blueprint.route("/")
 def home():
-    return render_template('main/home.html')
+    return render_template("main/home.html")
 
 
 @main_blueprint.route("/about/")

{{cookiecutter.app_slug}}/project/server/models.py

@@ -10,7 +10,7 @@
 
 class User(db.Model):
 
-    __tablename__ = 'users'
+    __tablename__ = "users"
 
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     email = db.Column(db.String(255), unique=True, nullable=False)
@@ -21,8 +21,8 @@ class User(db.Model):
     def __init__(self, email, password, admin=False):
         self.email = email
         self.password = bcrypt.generate_password_hash(
-            password, current_app.config.get('BCRYPT_LOG_ROUNDS')
-        ).decode('utf-8')
+            password, current_app.config.get("BCRYPT_LOG_ROUNDS")
+        ).decode("utf-8")
         self.registered_on = datetime.datetime.now()
         self.admin = admin
 
@@ -39,4 +39,4 @@ def get_id(self):
         return self.id
 
     def __repr__(self):
-        return '<User {0}>'.format(self.email)
+        return "<User {0}>".format(self.email)

{{cookiecutter.app_slug}}/project/server/user/forms.py

@@ -7,27 +7,26 @@
 
 
 class LoginForm(FlaskForm):
-    email = StringField('Email Address', [DataRequired(), Email()])
-    password = PasswordField('Password', [DataRequired()])
+    email = StringField("Email Address", [DataRequired(), Email()])
+    password = PasswordField("Password", [DataRequired()])
 
 
 class RegisterForm(FlaskForm):
     email = StringField(
-        'Email Address',
+        "Email Address",
         validators=[
             DataRequired(),
             Email(message=None),
-            Length(min=6, max=40)
-        ]
+            Length(min=6, max=40),
+        ],
     )
     password = PasswordField(
-        'Password',
-        validators=[DataRequired(), Length(min=6, max=25)]
+        "Password", validators=[DataRequired(), Length(min=6, max=25)]
     )
     confirm = PasswordField(
-        'Confirm password',
+        "Confirm password",
         validators=[
             DataRequired(),
-            EqualTo('password', message='Passwords must match.')
-        ]
+            EqualTo("password", message="Passwords must match."),
+        ],
     )

{{cookiecutter.app_slug}}/project/server/user/views.py

@@ -1,62 +1,59 @@
 # project/server/user/views.py
 
 
-from flask import render_template, Blueprint, url_for, \
-    redirect, flash, request
+from flask import render_template, Blueprint, url_for, redirect, flash, request
 from flask_login import login_user, logout_user, login_required
 
 from project.server import bcrypt, db
 from project.server.models import User
 from project.server.user.forms import LoginForm, RegisterForm
 
 
-user_blueprint = Blueprint('user', __name__,)
+user_blueprint = Blueprint("user", __name__)
 
 
-@user_blueprint.route('/register', methods=['GET', 'POST'])
+@user_blueprint.route("/register", methods=["GET", "POST"])
 def register():
     form = RegisterForm(request.form)
     if form.validate_on_submit():
-        user = User(
-            email=form.email.data,
-            password=form.password.data
-        )
+        user = User(email=form.email.data, password=form.password.data)
         db.session.add(user)
         db.session.commit()
 
         login_user(user)
 
-        flash('Thank you for registering.', 'success')
+        flash("Thank you for registering.", "success")
         return redirect(url_for("user.members"))
 
-    return render_template('user/register.html', form=form)
+    return render_template("user/register.html", form=form)
 
 
-@user_blueprint.route('/login', methods=['GET', 'POST'])
+@user_blueprint.route("/login", methods=["GET", "POST"])
 def login():
     form = LoginForm(request.form)
     if form.validate_on_submit():
         user = User.query.filter_by(email=form.email.data).first()
         if user and bcrypt.check_password_hash(
-                user.password, request.form['password']):
+            user.password, request.form["password"]
+        ):
             login_user(user)
-            flash('You are logged in. Welcome!', 'success')
-            return redirect(url_for('user.members'))
+            flash("You are logged in. Welcome!", "success")
+            return redirect(url_for("user.members"))
         else:
-            flash('Invalid email and/or password.', 'danger')
-            return render_template('user/login.html', form=form)
-    return render_template('user/login.html', title='Please Login', form=form)
+            flash("Invalid email and/or password.", "danger")
+            return render_template("user/login.html", form=form)
+    return render_template("user/login.html", title="Please Login", form=form)
 
 
-@user_blueprint.route('/logout')
+@user_blueprint.route("/logout")
 @login_required
 def logout():
     logout_user()
-    flash('You were logged out. Bye!', 'success')
-    return redirect(url_for('main.home'))
+    flash("You were logged out. Bye!", "success")
+    return redirect(url_for("main.home"))
 
 
-@user_blueprint.route('/members')
+@user_blueprint.route("/members")
 @login_required
 def members():
-    return render_template('user/members.html')
+    return render_template("user/members.html")

{{cookiecutter.app_slug}}/project/tests/base.py

@@ -10,9 +10,8 @@
 
 
 class BaseTestCase(TestCase):
-
     def create_app(self):
-        app.config.from_object('project.server.config.TestingConfig')
+        app.config.from_object("project.server.config.TestingConfig")
         return app
 
     def setUp(self):