From c130e3ee79affaf9e2e52a98506ffb1a7f5c9db6 Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 8 Jan 2013 22:12:16 +0100 Subject: [PATCH] Move db.sql.migration_tools to db.migration_tools. Follow the new trend. --- mediagoblin/db/{sql => }/migration_tools.py | 0 mediagoblin/db/migrations.py | 2 +- mediagoblin/gmg_commands/dbupdate.py | 2 +- mediagoblin/plugins/oauth/migrations.py | 2 +- mediagoblin/tests/test_sql_migrations.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename mediagoblin/db/{sql => }/migration_tools.py (100%) diff --git a/mediagoblin/db/sql/migration_tools.py b/mediagoblin/db/migration_tools.py similarity index 100% rename from mediagoblin/db/sql/migration_tools.py rename to mediagoblin/db/migration_tools.py diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 469d2874..80ec5269 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -23,7 +23,7 @@ from sqlalchemy.exc import ProgrammingError from sqlalchemy.ext.declarative import declarative_base from migrate.changeset.constraint import UniqueConstraint -from mediagoblin.db.sql.migration_tools import RegisterMigration, inspect_table +from mediagoblin.db.migration_tools import RegisterMigration, inspect_table from mediagoblin.db.models import MediaEntry, Collection, User MIGRATIONS = {} diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py index dadb79c7..65b3f922 100644 --- a/mediagoblin/gmg_commands/dbupdate.py +++ b/mediagoblin/gmg_commands/dbupdate.py @@ -19,7 +19,7 @@ import logging from sqlalchemy.orm import sessionmaker from mediagoblin.db.open import setup_connection_and_db_from_config -from mediagoblin.db.sql.migration_tools import MigrationManager +from mediagoblin.db.migration_tools import MigrationManager from mediagoblin.init import setup_global_and_app_config from mediagoblin.tools.common import import_component diff --git a/mediagoblin/plugins/oauth/migrations.py b/mediagoblin/plugins/oauth/migrations.py index 45256dcc..6aa0d7cb 100644 --- a/mediagoblin/plugins/oauth/migrations.py +++ b/mediagoblin/plugins/oauth/migrations.py @@ -19,7 +19,7 @@ from sqlalchemy import (MetaData, Table, Column, Integer, Unicode, Enum, DateTime, ForeignKey) from sqlalchemy.ext.declarative import declarative_base -from mediagoblin.db.sql.migration_tools import RegisterMigration +from mediagoblin.db.migration_tools import RegisterMigration from mediagoblin.db.models import User diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py index 4a260228..2fc4c043 100644 --- a/mediagoblin/tests/test_sql_migrations.py +++ b/mediagoblin/tests/test_sql_migrations.py @@ -26,7 +26,7 @@ from sqlalchemy.sql import select, insert from migrate import changeset from mediagoblin.db.base import GMGTableBase -from mediagoblin.db.sql.migration_tools import MigrationManager, RegisterMigration +from mediagoblin.db.migration_tools import MigrationManager, RegisterMigration from mediagoblin.tools.common import CollectingPrinter -- 2.25.1