Merge "sqlalchemy: Use built-in declarative"

masakari/db/sqlalchemy/models.py

@@ -17,12 +17,11 @@ from oslo_db.sqlalchemy import models
 from oslo_utils import timeutils
 from sqlalchemy import (Column, DateTime, Index, Integer, Enum, String,
                         schema)
-from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import orm
 from sqlalchemy import ForeignKey, Boolean, Text
 
 
-BASE = declarative_base()
+BASE = orm.declarative_base()
 
 
 class MasakariTimestampMixin(object):

requirements.txt

@@ -19,7 +19,7 @@ oslo.versionedobjects>=1.31.2 # Apache-2.0
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 python-novaclient>=9.1.0 # Apache-2.0
 stevedore>=1.20.0 # Apache-2.0
-SQLAlchemy>=1.2.19 # MIT
+SQLAlchemy>=1.4.0 # MIT
 SQLAlchemy-Utils>=0.33.10 # Apache-2.0
 taskflow>=2.16.0 # Apache-2.0
 tooz>=2.10.1 # Apache-2.0