diff --git a/extrapypi/app.py b/extrapypi/app.py index 59498e6..dede537 100644 --- a/extrapypi/app.py +++ b/extrapypi/app.py @@ -29,7 +29,7 @@ from extrapypi.commons import login, filters from extrapypi import simple, utils, dashboard, user -from extrapypi.extensions import db, login_manager, csrf, principal +from extrapypi.extensions import db, login_manager, csrf, principal, migrate def create_app(testing=False, config=None): @@ -76,6 +76,12 @@ def configure_extensions(app): principal.init_app(app) + migrations_path = os.path.join( + os.path.dirname(os.path.abspath(__file__)), + 'migrations' + ) + migrate.init_app(app, db, directory=migrations_path) + def register_filters(app): """Register additionnal jinja2 filters""" diff --git a/extrapypi/commons/packages.py b/extrapypi/commons/packages.py index 6cc1e8d..cf52079 100644 --- a/extrapypi/commons/packages.py +++ b/extrapypi/commons/packages.py @@ -102,7 +102,6 @@ def create_release(data, config, files): home_page=data.get('home_page', 'UNKNOWN'), version=data['version'], keywords=data.get('keywords'), - md5_digest=data['md5_digest'], package=package ) @@ -148,7 +147,6 @@ def create_release_from_source(metadata, user): home_page=metadata.get('home_page', 'UNKNOWN'), version=metadata['version'], keywords=metadata.get('keywords'), - md5_digest=metadata['md5_digest'], package=package ) db.session.add(release) diff --git a/extrapypi/extensions.py b/extrapypi/extensions.py index 818101c..6ca9a1c 100644 --- a/extrapypi/extensions.py +++ b/extrapypi/extensions.py @@ -1,3 +1,4 @@ +from flask_migrate import Migrate from flask_login import LoginManager from flask_principal import Principal from flask_wtf.csrf import CSRFProtect @@ -8,3 +9,4 @@ db = SQLAlchemy() login_manager = LoginManager() principal = Principal() +migrate = Migrate() diff --git a/extrapypi/manage.py b/extrapypi/manage.py index 8459c3e..0c1d8fb 100644 --- a/extrapypi/manage.py +++ b/extrapypi/manage.py @@ -25,7 +25,8 @@ def cli(): @click.option('--pip-pwd', default='pip', help="installer password") def init(user, password, pip_user, pip_pwd): """Init database and create an admin user""" - from extrapypi.extensions import db + from flask_migrate import stamp + from extrapypi.extensions import db, migrate from extrapypi import models click.echo("Creating database...") db.create_all() @@ -53,6 +54,7 @@ def init(user, password, pip_user, pip_pwd): db.session.commit() click.echo("User %s created" % user.username) click.echo("User %s created" % pip_usr.username) + stamp(directory=migrate.directory) @cli.command("start") diff --git a/extrapypi/migrations/README b/extrapypi/migrations/README new file mode 100755 index 0000000..98e4f9c --- /dev/null +++ b/extrapypi/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/extrapypi/migrations/alembic.ini b/extrapypi/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/extrapypi/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/extrapypi/migrations/env.py b/extrapypi/migrations/env.py new file mode 100755 index 0000000..23663ff --- /dev/null +++ b/extrapypi/migrations/env.py @@ -0,0 +1,87 @@ +from __future__ import with_statement +from alembic import context +from sqlalchemy import engine_from_config, pool +from logging.config import fileConfig +import logging + +# 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) +logger = logging.getLogger('alembic.env') + +# 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. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + 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, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args) + + 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/extrapypi/migrations/script.py.mako b/extrapypi/migrations/script.py.mako new file mode 100755 index 0000000..2c01563 --- /dev/null +++ b/extrapypi/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/extrapypi/migrations/versions/21a32f52b0c3_remove_digest_from_release_model.py b/extrapypi/migrations/versions/21a32f52b0c3_remove_digest_from_release_model.py new file mode 100644 index 0000000..f0fbc25 --- /dev/null +++ b/extrapypi/migrations/versions/21a32f52b0c3_remove_digest_from_release_model.py @@ -0,0 +1,26 @@ +"""remove digest from release model + +Revision ID: 21a32f52b0c3 +Revises: e9ba59cdb7b9 +Create Date: 2018-01-02 18:30:24.105748 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '21a32f52b0c3' +down_revision = 'e9ba59cdb7b9' +branch_labels = None +depends_on = None + + +def upgrade(): + with op.batch_alter_table("release") as batch_op: + batch_op.drop_column('md5_digest') + + +def downgrade(): + with op.batch_alter_table("release") as batch_op: + batch_op.add_column(sa.Column('md5_digest', sa.VARCHAR(length=32), nullable=False)) diff --git a/extrapypi/migrations/versions/e9ba59cdb7b9_initial_migration.py b/extrapypi/migrations/versions/e9ba59cdb7b9_initial_migration.py new file mode 100644 index 0000000..666a2a3 --- /dev/null +++ b/extrapypi/migrations/versions/e9ba59cdb7b9_initial_migration.py @@ -0,0 +1,24 @@ +"""initial_migration + +Revision ID: e9ba59cdb7b9 +Revises: +Create Date: 2018-01-02 18:22:09.074471 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e9ba59cdb7b9' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + pass + + +def downgrade(): + pass diff --git a/extrapypi/models/release.py b/extrapypi/models/release.py index 647fe8b..6d0715b 100644 --- a/extrapypi/models/release.py +++ b/extrapypi/models/release.py @@ -11,7 +11,6 @@ class Release(db.Model): home_page = db.Column(db.String(2048, convert_unicode=True)) version = db.Column(db.String(80, convert_unicode=True)) keywords = db.Column(db.String(255, convert_unicode=True)) - md5_digest = db.Column(db.String(32), nullable=False) created_at = db.Column(db.DateTime, default=datetime.datetime.utcnow) updated_at = db.Column(db.DateTime, onupdate=datetime.datetime.utcnow) diff --git a/extrapypi/templates/dashboard/package_detail.html b/extrapypi/templates/dashboard/package_detail.html index 3f40554..e6d64dd 100644 --- a/extrapypi/templates/dashboard/package_detail.html +++ b/extrapypi/templates/dashboard/package_detail.html @@ -32,8 +32,6 @@