From db67c4489747f872e410cabebda28df387e55321 Mon Sep 17 00:00:00 2001 From: Yaguo Zhou Date: Tue, 5 Sep 2017 22:32:35 +0800 Subject: [PATCH] Upgrade oslo.db and Replace DbMigrationError with DBMigrationError DbMigrationError is deprecated and will NOT be thrown in oslo.db since oslo.db >=4.27.0, DBMigrationError will be thrown instead. Consumers should catch DBMigrationError instead of DbMigrationError Depends-On: Iab0566cf9f4552e91fa417e64472fa106e8bc86d Depends-On: I0ebd69c3d778acb5bec9e136627e345e7fcf2bd3 Change-Id: I8e4968d2f2ed90edc22161db60712896f6e9f024 --- masakari/db/sqlalchemy/migration.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/masakari/db/sqlalchemy/migration.py b/masakari/db/sqlalchemy/migration.py index 633409d6..9a05a2d9 100644 --- a/masakari/db/sqlalchemy/migration.py +++ b/masakari/db/sqlalchemy/migration.py @@ -72,5 +72,5 @@ def db_sync(version=None, init_version=INIT_VERSION, engine=None): abs_path=MIGRATE_REPO_PATH, version=version, init_version=init_version) - except oslo_exception.DbMigrationError as exc: + except oslo_exception.DBMigrationError as exc: raise exception.InvalidInput(reason=exc) diff --git a/requirements.txt b/requirements.txt index 3ca33563..7172e98d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ keystoneauth1>=2.21.0 # Apache-2.0 keystonemiddleware>=4.12.0 # Apache-2.0 microversion-parse>=0.1.2 # Apache-2.0 oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0 -oslo.db>=4.23.0 # Apache-2.0 +oslo.db>=4.27.0 # Apache-2.0 oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0 oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0 oslo.log>=3.22.0 # Apache-2.0