From e8a67a7650d49ada486a7404c404405eac96757c Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Wed, 6 Nov 2019 15:46:04 +0100
Subject: [PATCH] swh.lister: Remove completely references to
 swh.storage.schemata

Related to 56d7cff
---
 swh/lister/core/models.py     | 7 ++++---
 swh/lister/debian/__init__.py | 3 +--
 swh/lister/debian/models.py   | 3 +--
 swh/lister/debian/utils.py    | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/swh/lister/core/models.py b/swh/lister/core/models.py
index 62ab0b7..ed6a591 100644
--- a/swh/lister/core/models.py
+++ b/swh/lister/core/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017 the Software Heritage developers
+# Copyright (C) 2015-2019 the Software Heritage developers
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
@@ -7,12 +7,13 @@ from datetime import datetime
 import logging
 
 from sqlalchemy import Column, DateTime, Integer, String
-from sqlalchemy.ext.declarative import DeclarativeMeta
+from sqlalchemy.ext.declarative import DeclarativeMeta, declarative_base
 from typing import Type, Union
 
 from .abstractattribute import AbstractAttribute
 
-from swh.storage.schemata.distribution import SQLBase
+
+SQLBase = declarative_base()
 
 
 logger = logging.getLogger(__name__)
diff --git a/swh/lister/debian/__init__.py b/swh/lister/debian/__init__.py
index a071887..b1398f6 100644
--- a/swh/lister/debian/__init__.py
+++ b/swh/lister/debian/__init__.py
@@ -21,8 +21,7 @@ def debian_init(db_engine, lister=None,
 
     """
     distribution_name = 'Debian'
-    from swh.storage.schemata.distribution import (
-        Distribution, Area)
+    from swh.lister.debian.models import Distribution, Area
 
     if lister is None:
         from .lister import DebianLister
diff --git a/swh/lister/debian/models.py b/swh/lister/debian/models.py
index 6675cd2..3cba2f8 100644
--- a/swh/lister/debian/models.py
+++ b/swh/lister/debian/models.py
@@ -27,10 +27,9 @@ except ImportError:
     # SQLAlchemy < 1.1
     from sqlalchemy.dialects.postgresql import JSONB as JSON
 
-from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship
 
-SQLBase = declarative_base()
+from swh.lister.core.models import SQLBase
 
 
 class Distribution(SQLBase):
diff --git a/swh/lister/debian/utils.py b/swh/lister/debian/utils.py
index 2ed3c54..19a3e97 100644
--- a/swh/lister/debian/utils.py
+++ b/swh/lister/debian/utils.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 the Software Heritage developers
+# Copyright (C) 2017-2019 the Software Heritage developers
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
@@ -6,7 +6,7 @@ import logging
 
 import click
 
-from swh.storage.schemata.distribution import Distribution, Area, SQLBase
+from swh.lister.debian.models import Distribution, Area, SQLBase
 from swh.lister.debian.lister import DebianLister