openstack/nova
Code Issues Proposed changes

Merge "Bump to sqlalchemy-migrate 0.8.2"

Browse Source
This commit is contained in:
Jenkins
2013-11-29 23:48:11 +00:00
committed by Gerrit Code Review
parent f4ff98a590 e26fac5ed7
commit 94522f3ff2
3 changed files with 10 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
nova/db/sqlalchemy/migration.py
View File

@@ -16,48 +16,18 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import distutils.version as dist_version
import os import os
from migrate import exceptions as versioning_exceptions
from migrate.versioning import api as versioning_api
from migrate.versioning.repository import Repository
import sqlalchemy
from nova import exception from nova import exception
from nova.openstack.common.db.sqlalchemy import session as db_session from nova.openstack.common.db.sqlalchemy import session as db_session
from nova.openstack.common.gettextutils import _ from nova.openstack.common.gettextutils import _
import migrate
from migrate.versioning import util as migrate_util
import sqlalchemy
INIT_VERSION = 132 INIT_VERSION = 132
@migrate_util.decorator
def patched_with_engine(f, *a, **kw):
url = a[0]
engine = migrate_util.construct_engine(url, **kw)
try:
kw['engine'] = engine
return f(*a, **kw)
finally:
if isinstance(engine, migrate_util.Engine) and engine is not url:
migrate_util.log.debug('Disposing SQLAlchemy engine %s', engine)
engine.dispose()
# TODO(jkoelker) When migrate 0.7.3 is released and nova depends
# on that version or higher, this can be removed
MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3')
if (not hasattr(migrate, '__version__') or
dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION):
migrate_util.with_engine = patched_with_engine
# NOTE(jkoelker) Delay importing migrate until we are patched
from migrate import exceptions as versioning_exceptions
from migrate.versioning import api as versioning_api
from migrate.versioning.repository import Repository
_REPOSITORY = None _REPOSITORY = None
get_engine = db_session.get_engine get_engine = db_session.get_engine

37
nova/virt/baremetal/db/sqlalchemy/migration.py
View File

@@ -16,10 +16,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import distutils.version as dist_version
import migrate
from migrate.versioning import util as migrate_util
import os import os
from migrate import exceptions as versioning_exceptions
from migrate.versioning import api as versioning_api
from migrate.versioning.repository import Repository
import sqlalchemy import sqlalchemy
from nova import exception from nova import exception
@@ -27,36 +28,6 @@ from nova.openstack.common.gettextutils import _
from nova.virt.baremetal.db.sqlalchemy import session from nova.virt.baremetal.db.sqlalchemy import session
INIT_VERSION = 0 INIT_VERSION = 0
@migrate_util.decorator
def patched_with_engine(f, *a, **kw):
url = a[0]
engine = migrate_util.construct_engine(url, **kw)
try:
kw['engine'] = engine
return f(*a, **kw)
finally:
if isinstance(engine, migrate_util.Engine) and engine is not url:
migrate_util.log.debug('Disposing SQLAlchemy engine %s', engine)
engine.dispose()
# TODO(jkoelker) When migrate 0.7.3 is released and nova depends
# on that version or higher, this can be removed
MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3')
if (not hasattr(migrate, '__version__') or
dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION):
migrate_util.with_engine = patched_with_engine
# NOTE(jkoelker) Delay importing migrate until we are patched
from migrate import exceptions as versioning_exceptions
from migrate.versioning import api as versioning_api
from migrate.versioning.repository import Repository
_REPOSITORY = None _REPOSITORY = None

2
requirements.txt
View File

@@ -13,7 +13,7 @@ WebOb>=1.2.3,<1.3
greenlet>=0.3.2 greenlet>=0.3.2
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0
Paste Paste
sqlalchemy-migrate>=0.7.2 sqlalchemy-migrate>=0.8.2
netaddr>=0.7.6 netaddr>=0.7.6
suds>=0.4 suds>=0.4
paramiko>=1.8.0 paramiko>=1.8.0