From ffb2e1d0331c9d277bef76fed6d992f885e93eaa Mon Sep 17 00:00:00 2001 From: Kyle Mahan Date: Sat, 18 Apr 2015 17:42:01 -0700 Subject: [PATCH] start using alembic --- manage.py | 12 +++ migrations/README | 1 + migrations/alembic.ini | 45 ++++++++++++ migrations/env.py | 73 +++++++++++++++++++ migrations/script.py.mako | 22 ++++++ .../2015-03-26-normalize-urls.py | 0 .../20150318-clean-content.py | 0 woodwind/extensions.py | 9 ++- woodwind/tasks.py | 5 +- 9 files changed, 162 insertions(+), 5 deletions(-) create mode 100755 manage.py create mode 100755 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100755 migrations/script.py.mako rename {migrations => scripts}/2015-03-26-normalize-urls.py (100%) rename {migrations => scripts}/20150318-clean-content.py (100%) diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..9804541 --- /dev/null +++ b/manage.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python + +from woodwind import create_app +from flask.ext.script import Manager +from flask.ext.migrate import MigrateCommand + +app = create_app() +manager = Manager(app) +manager.add_command('db', MigrateCommand) + +if __name__ == '__main__': + manager.run() diff --git a/migrations/README b/migrations/README new file mode 100755 index 0000000..98e4f9c --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..70961ce --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,73 @@ +from __future__ import with_statement +from alembic import context +from sqlalchemy import engine_from_config, pool +from logging.config import fileConfig + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from flask import current_app +config.set_main_option('sqlalchemy.url', current_app.config.get('SQLALCHEMY_DATABASE_URI')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure(url=url) + + with context.begin_transaction(): + context.run_migrations() + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + engine = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool) + + connection = engine.connect() + context.configure( + connection=connection, + target_metadata=target_metadata + ) + + try: + with context.begin_transaction(): + context.run_migrations() + finally: + connection.close() + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() + diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100755 index 0000000..9570201 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,22 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision} +Create Date: ${create_date} + +""" + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/2015-03-26-normalize-urls.py b/scripts/2015-03-26-normalize-urls.py similarity index 100% rename from migrations/2015-03-26-normalize-urls.py rename to scripts/2015-03-26-normalize-urls.py diff --git a/migrations/20150318-clean-content.py b/scripts/20150318-clean-content.py similarity index 100% rename from migrations/20150318-clean-content.py rename to scripts/20150318-clean-content.py diff --git a/woodwind/extensions.py b/woodwind/extensions.py index 2d565a2..2cd75fe 100644 --- a/woodwind/extensions.py +++ b/woodwind/extensions.py @@ -1,18 +1,21 @@ from flask.ext.login import LoginManager from flask.ext.micropub import MicropubClient from flask.ext.sqlalchemy import SQLAlchemy -from flask_debugtoolbar import DebugToolbarExtension +#from flask_debugtoolbar import DebugToolbarExtension +from flask.ext.migrate import Migrate db = SQLAlchemy() micropub = MicropubClient(client_id='http://reader.kylewm.com') login_mgr = LoginManager() login_mgr.login_view = 'views.index' -toolbar = DebugToolbarExtension() +#toolbar = DebugToolbarExtension() +migrate = Migrate() def init_app(app): db.init_app(app) micropub.init_app(app) login_mgr.init_app(app) - toolbar.init_app(app) + #toolbar.init_app(app) + migrate.init_app(app, db) diff --git a/woodwind/tasks.py b/woodwind/tasks.py index ecc49e0..3e9cb7e 100644 --- a/woodwind/tasks.py +++ b/woodwind/tasks.py @@ -10,6 +10,7 @@ import json import logging import mf2py import mf2util +import os.path import re import requests import rq @@ -19,8 +20,8 @@ import sys import time import urllib.parse -config = FlaskConfig('/srv/www/kylewm.com/woodwind') -config.from_pyfile('woodwind.cfg') +config = FlaskConfig(os.path.dirname(os.path.realpath(__file__))) +config.from_pyfile('../woodwind.cfg') # normal update interval for polling feeds UPDATE_INTERVAL = datetime.timedelta(hours=1)