From c67a926f266a6532f8185aca24a81dd35484000f Mon Sep 17 00:00:00 2001 From: David Douard Date: Tue, 3 Sep 2019 10:17:14 +0200 Subject: [PATCH] npm: make NpmVisitModel use the main declarative base class from core.models This is needed by the (refactored) db init mechanism, since this later uses the main declarative base class (thus the main MetaData instance) to gather tables to be created/dropped. --- swh/lister/cli.py | 2 +- swh/lister/npm/models.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/swh/lister/cli.py b/swh/lister/cli.py index bb10ac3..964f7ad 100644 --- a/swh/lister/cli.py +++ b/swh/lister/cli.py @@ -112,7 +112,7 @@ def get_lister(lister_name, db_url, drop_tables=False, **conf): elif lister_name == 'phabricator': from .phabricator.models import IndexingModelBase as ModelBase from .phabricator.lister import PhabricatorLister - _lister = PhabricatorLister(forge_url=api_baseurl, + _lister = PhabricatorLister(api_baseurl=api_baseurl, override_config=override_conf) elif lister_name == 'gnu': diff --git a/swh/lister/npm/models.py b/swh/lister/npm/models.py index 206ae36..5eb8d0d 100644 --- a/swh/lister/npm/models.py +++ b/swh/lister/npm/models.py @@ -3,11 +3,8 @@ # See top-level LICENSE file for more information from sqlalchemy import Column, String, DateTime, Integer, BigInteger, Sequence -from sqlalchemy.ext.declarative import declarative_base -from swh.lister.core.models import IndexingModelBase, ABCSQLMeta - -SQLBase = declarative_base() +from swh.lister.core.models import IndexingModelBase, SQLBase, ABCSQLMeta class NpmVisitModel(SQLBase, metaclass=ABCSQLMeta):