diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-25 19:02:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-25 19:02:15 +0000 |
| commit | d28af7e0ebae0f67f5778f67cc27636c7aa8177c (patch) | |
| tree | f61b75a7614bcc8dc28d1fcda6ec130e41a660cb | |
| parent | 04d86769c205284e1ac147e76f84ea850090e328 (diff) | |
| parent | b43844b19cf8518e9d6eea19df6030304409345d (diff) | |
| download | oslo-db-d28af7e0ebae0f67f5778f67cc27636c7aa8177c.tar.gz | |
Merge "Use stevedore directive to document plugins"
| -rwxr-xr-x | doc/source/conf.py | 3 | ||||
| -rw-r--r-- | doc/source/usage.rst | 8 | ||||
| -rw-r--r-- | oslo_db/sqlalchemy/migration_cli/ext_alembic.py | 14 |
3 files changed, 17 insertions, 8 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index aa53ed0..69fb87a 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -23,7 +23,8 @@ extensions = [ 'sphinx.ext.autodoc', #'sphinx.ext.intersphinx', 'oslo_config.sphinxext', - 'oslosphinx' + 'oslosphinx', + 'stevedore.sphinxext' ] # autodoc generation is a bit aggressive and a nuisance when doing heavy diff --git a/doc/source/usage.rst b/doc/source/usage.rst index cc4f2fd..e437c6c 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -136,3 +136,11 @@ DB API backend support # DB-API method def do_something(somethind_id): return IMPL.do_something(somethind_id) + +DB migration extensions +======================= + +Available extensions for :mod:`oslo_db.migration`. + +.. list-plugins:: oslo.db.migration + :detailed: diff --git a/oslo_db/sqlalchemy/migration_cli/ext_alembic.py b/oslo_db/sqlalchemy/migration_cli/ext_alembic.py index a855321..e44fbc8 100644 --- a/oslo_db/sqlalchemy/migration_cli/ext_alembic.py +++ b/oslo_db/sqlalchemy/migration_cli/ext_alembic.py @@ -21,6 +21,13 @@ from oslo_db.sqlalchemy.migration_cli import ext_base class AlembicExtension(ext_base.MigrationExtensionBase): + """Extension to provide alembic features. + + :param engine: SQLAlchemy engine instance for a given database + :type engine: sqlalchemy.engine.Engine + :param migration_config: Stores specific configuration for migrations + :type migration_config: dict + """ order = 2 @@ -29,13 +36,6 @@ class AlembicExtension(ext_base.MigrationExtensionBase): return os.path.exists(self.alembic_ini_path) def __init__(self, engine, migration_config): - """Extension to provide alembic features. - - :param engine: SQLAlchemy engine instance for a given database - :type engine: sqlalchemy.engine.Engine - :param migration_config: Stores specific configuration for migrations - :type migration_config: dict - """ self.alembic_ini_path = migration_config.get('alembic_ini_path', '') self.config = alembic_config.Config(self.alembic_ini_path) # TODO(viktors): Remove this, when we will use Alembic 0.7.5 or |