From 5636008dfe30beb7311f7f65b500cb852cd394e4 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 18 Jul 2023 17:10:17 +0100 Subject: [PATCH] db: Update import location of declarative_base This moved in 1.4. Change-Id: Ie3d30669dffd80aa21025a7a407c373b80b2e3cc Signed-off-by: Stephen Finucane --- glance/db/sqlalchemy/models.py | 2 +- glance/db/sqlalchemy/models_metadef.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glance/db/sqlalchemy/models.py b/glance/db/sqlalchemy/models.py index 639dc6278f..8847a03294 100644 --- a/glance/db/sqlalchemy/models.py +++ b/glance/db/sqlalchemy/models.py @@ -27,10 +27,10 @@ from sqlalchemy import Boolean from sqlalchemy import Column from sqlalchemy import DateTime from sqlalchemy import Enum -from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import ForeignKey from sqlalchemy import Index from sqlalchemy import Integer +from sqlalchemy.orm import declarative_base from sqlalchemy.orm import backref, relationship from sqlalchemy import sql from sqlalchemy import String diff --git a/glance/db/sqlalchemy/models_metadef.py b/glance/db/sqlalchemy/models_metadef.py index 3d822c7c7b..93ffd3bd5b 100644 --- a/glance/db/sqlalchemy/models_metadef.py +++ b/glance/db/sqlalchemy/models_metadef.py @@ -20,10 +20,10 @@ from oslo_db.sqlalchemy import models from sqlalchemy import Boolean from sqlalchemy import Column from sqlalchemy import DateTime -from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import ForeignKey from sqlalchemy import Index from sqlalchemy import Integer +from sqlalchemy.orm import declarative_base from sqlalchemy.orm import relationship from sqlalchemy import String from sqlalchemy import Text