From 26eae7290279ba3001c20485aba1e426d4ea1305 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 20 Nov 2024 02:12:28 +0900 Subject: [PATCH] Resolve MovedIn20Warning Adjust the import according to the following warning. MovedIn20Warning: The ``declarative_base()`` function is now available as sqlalchemy.orm.declarative_base(). (deprecated since: 2.0) (Background on SQLAlchemy 2.0 at: https://sqlalche.me/e/b8d9) Change-Id: Iecbb574937f48c6e36a57ccab37f7f351cd14419 --- cinder/db/sqlalchemy/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinder/db/sqlalchemy/models.py b/cinder/db/sqlalchemy/models.py index 1aa8e0d2274..43411d38412 100644 --- a/cinder/db/sqlalchemy/models.py +++ b/cinder/db/sqlalchemy/models.py @@ -26,11 +26,11 @@ from oslo_utils import timeutils import sqlalchemy as sa # imports needed for cinderlib from sqlalchemy import Column, String, Text # noqa: F401 -from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import func from sqlalchemy import schema from sqlalchemy.sql import expression -from sqlalchemy.orm import backref, column_property, relationship, validates +from sqlalchemy.orm import backref, column_property, declarative_base, \ + relationship, validates CONF = cfg.CONF