6 files changed, 15 insertions(+), 139 deletions(-)

D alembic.ini.example
M config.example.ini
A git-srht-migrate
D gitsrht/alembic/README
M gitsrht/alembic/env.py
M setup.py

@@ 1,58 0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-script_location = gitsrht/alembic
-
-# template used to generate migration files
-# file_template = %%(rev)s_%%(slug)s
-
-# max length of characters to apply to the
-# "slug" field
-#truncate_slug_length = 40
-
-# set to 'true' to run the environment during
-# the 'revision' command, regardless of autogenerate
-# revision_environment = false
-
-# set to 'true' to allow .pyc and .pyo files without
-# a source .py file to be detected as revisions in the
-# versions/ directory
-# sourceless = false
-
-sqlalchemy.url = postgres://postgres@localhost/git.sr.ht
-
-# 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

@@ 46,11 46,14 @@ debug-port=5001
 # Configures the SQLAlchemy connection string for the database.
 connection-string=postgresql://postgres@localhost/git.sr.ht
 #
+# Set to "yes" to automatically run migrations on package upgrade.
+migrate-on-upgrade=yes
+#
 # The redis connection used for the Celery worker
 redis=redis://localhost:6379/1
 #
 # A post-update script which is installed in every git repo.
-post-update-script=/usr/bin/git-srht-update-hook
+post-update-script=/usr/bin/gitsrht-update-hook
 #
 # git.sr.ht's OAuth client ID and secret for meta.sr.ht
 # Register your client at meta.example.org/oauth

@@ 0,0 1,5 @@
+#!/usr/bin/env python3
+import gitsrht.alembic
+from srht.config import cfg
+from srht.database import alembic
+alembic("git.sr.ht", gitsrht.alembic)

@@ 1,1 0,0 @@
-Generic single-database configuration.>
\ No newline at end of file

@@ 1,78 1,3 @@
-from __future__ import with_statement
-import os, sys
-sys.path.append(os.getcwd())
-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 gitsrht.app import app, db
-from srht.database import Base
-target_metadata = Base.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,
-            target_metadata=target_metadata,
-            include_schemas=True
-        )
-
-    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,
-                include_schemas=True
-            )
-
-    try:
-        with context.begin_transaction():
-            context.run_migrations()
-    finally:
-        connection.close()
-
-if context.is_offline_mode():
-    run_migrations_offline()
-else:
-    run_migrations_online()
-
+import gitsrht.types
+from srht.database import alembic_env
+alembic_env()

@@ 60,10 60,12 @@ setup(
       ]
   },
   scripts = [
+      # TODO: Remove this dumb - between git and srht
       'git-srht-dispatch',
       'git-srht-keys',
+      'git-srht-migrate',
+      'git-srht-periodic'
       'git-srht-shell',
       'git-srht-update-hook',
-      'git-srht-periodic'
   ]
 )