Merge "sqlalchemy: Use built-in declarative"

manila/db/sqlalchemy/models.py

@@ -22,7 +22,6 @@ SQLAlchemy models for Manila data.
 from oslo_config import cfg
 from oslo_db.sqlalchemy import models
 from sqlalchemy import Column, Integer, String, schema
-from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import orm
 from sqlalchemy import ForeignKey, DateTime, Boolean, Enum
 from sqlalchemy_utils import generic_repr
@@ -30,7 +29,7 @@ from sqlalchemy_utils import generic_repr
 from manila.common import constants
 
 CONF = cfg.CONF
-BASE = declarative_base()
+BASE = orm.declarative_base()
 
 
 @generic_repr

requirements.txt

@@ -38,7 +38,7 @@ keystonemiddleware>=9.1.0 # Apache-2.0
 requests>=2.23.0 # Apache-2.0
 tenacity>=6.3.1  # Apache-2.0
 Routes>=2.4.1 # MIT
-SQLAlchemy>=1.3.17 # MIT
+SQLAlchemy>=1.4.0 # MIT
 SQLAlchemy-Utils>=0.38.3 # BSD License
 stevedore>=3.2.2 # Apache-2.0
 tooz>=2.7.1 # Apache-2.0