diff --git a/README.md b/README.md index b0aef02..893fa58 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,13 @@ Boilerplate application for a Flask JWT Backend and a React/Redux Front-End with ```sh $ export DATABASE_URL="postgresql://localhost/yourdb" $ python manage.py create_db -$ python manage.py db init +$ python manage.py db upgrade $ python manage.py db migrate +``` + +To update database after creating new migrations, use: + +```sh $ python manage.py db upgrade ``` diff --git a/application/app.py b/application/app.py index 9263689..b35e148 100644 --- a/application/app.py +++ b/application/app.py @@ -1,8 +1,8 @@ from flask import request, render_template, jsonify, url_for, redirect, g -from models import User +from .models import User from index import app, db from sqlalchemy.exc import IntegrityError -from utils.auth import generate_token, requires_auth, verify_token +from .utils.auth import generate_token, requires_auth, verify_token @app.route('/', methods=['GET']) diff --git a/config.py b/config.py index be8d066..fa060d0 100644 --- a/config.py +++ b/config.py @@ -7,6 +7,7 @@ class BaseConfig(object): SECRET_KEY = "SO_SECURE" DEBUG = True SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL'] + SQLALCHEMY_TRACK_MODIFICATIONS = True class TestingConfig(object): diff --git a/index.py b/index.py index 810173a..9ed25c2 100644 --- a/index.py +++ b/index.py @@ -1,7 +1,7 @@ from flask import Flask -from flask.ext.sqlalchemy import SQLAlchemy +from flask_sqlalchemy import SQLAlchemy from config import BaseConfig -from flask.ext.bcrypt import Bcrypt +from flask_bcrypt import Bcrypt app = Flask(__name__, static_folder="./static/dist", template_folder="./static") app.config.from_object(BaseConfig) diff --git a/manage.py b/manage.py index 1cb2ac3..a3365a3 100644 --- a/manage.py +++ b/manage.py @@ -1,5 +1,5 @@ -from flask.ext.script import Manager -from flask.ext.migrate import Migrate, MigrateCommand +from flask_script import Manager +from flask_migrate import Migrate, MigrateCommand from application.app import app, db diff --git a/migrations/versions/ed657e16ce20_.py b/migrations/versions/ed657e16ce20_.py new file mode 100644 index 0000000..eb88b7c --- /dev/null +++ b/migrations/versions/ed657e16ce20_.py @@ -0,0 +1,26 @@ +"""empty message + +Revision ID: ed657e16ce20 +Revises: 41c073a46b63 +Create Date: 2016-08-28 11:50:20.973452 + +""" + +# revision identifiers, used by Alembic. +revision = 'ed657e16ce20' +down_revision = '41c073a46b63' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + pass + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + pass + ### end Alembic commands ### diff --git a/testing_config.py b/testing_config.py index 9cd85b0..32e49c6 100644 --- a/testing_config.py +++ b/testing_config.py @@ -1,4 +1,4 @@ -from flask.ext.testing import TestCase +from flask_testing import TestCase from application.app import app, db from application.models import User import os