From 4adde2c0aeedc24cae6975170176a21708f4d860 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 30 Jun 2025 22:01:52 +0900 Subject: [PATCH] sqlalchemy: Use built-in declarative sqlalchemy.ext.declarative was deprecated in sqlalchemy 1.4.0, due to the built-in implementations[1]. [1] https://github.com/sqlalchemy/sqlalchemy/commit/450f5c0d6519a439f40 Change-Id: I9cd2abc2cef74efac63500c9ad74ef343d8fbbbe Signed-off-by: Takashi Kajinami --- nova/db/api/models.py | 3 +-- nova/db/main/models.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nova/db/api/models.py b/nova/db/api/models.py index 5a236e98f16c..2abae49be949 100644 --- a/nova/db/api/models.py +++ b/nova/db/api/models.py @@ -15,7 +15,6 @@ from oslo_db.sqlalchemy import models from oslo_log import log as logging import sqlalchemy as sa import sqlalchemy.dialects.mysql -from sqlalchemy.ext import declarative from sqlalchemy import orm from sqlalchemy import schema @@ -62,7 +61,7 @@ class _NovaAPIBase(models.ModelBase, models.TimestampMixin): pass -BASE = declarative.declarative_base(cls=_NovaAPIBase) +BASE = orm.declarative_base(cls=_NovaAPIBase) class AggregateHost(BASE): diff --git a/nova/db/main/models.py b/nova/db/main/models.py index ee82b2ea1161..0727b0cc3fd4 100644 --- a/nova/db/main/models.py +++ b/nova/db/main/models.py @@ -24,7 +24,6 @@ from oslo_db.sqlalchemy import models from oslo_utils import timeutils import sqlalchemy as sa import sqlalchemy.dialects.mysql -from sqlalchemy.ext import declarative from sqlalchemy import orm from sqlalchemy import schema @@ -101,7 +100,7 @@ REMOVED_TABLES = { # we don't configure 'cls' since we have models that don't use the # TimestampMixin -BASE = declarative.declarative_base() +BASE = orm.declarative_base() class NovaBase(models.TimestampMixin, models.ModelBase):