From 9aefbc872e0f543fba401fbe641d5b89ebb3ea34 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 15 Mar 2020 12:37:31 -0500 Subject: [PATCH] Rename `rattail import-corepos` command to `import-corepos-db` to prepare for `import-corepos-api` --- rattail_corepos/commands.py | 10 +++---- rattail_corepos/importing/corepos/__init__.py | 28 +++++++++++++++++++ .../importing/{corepos.py => corepos/db.py} | 2 +- setup.py | 2 +- 4 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 rattail_corepos/importing/corepos/__init__.py rename rattail_corepos/importing/{corepos.py => corepos/db.py} (99%) diff --git a/rattail_corepos/commands.py b/rattail_corepos/commands.py index f0998d0..f52abf4 100644 --- a/rattail_corepos/commands.py +++ b/rattail_corepos/commands.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2018 Lance Edgar +# Copyright © 2010-2020 Lance Edgar # # This file is part of Rattail. # @@ -24,8 +24,6 @@ Rattail Commands """ -from __future__ import unicode_literals, absolute_import - from rattail import commands from rattail.util import load_object @@ -47,15 +45,15 @@ class ExportCore(commands.ImportSubcommand): return load_object(spec) -class ImportCOREPOS(commands.ImportSubcommand): +class ImportCOREPOSDB(commands.ImportSubcommand): """ Import data from a CORE POS database """ - name = 'import-corepos' + name = 'import-corepos-db' description = __doc__.strip() def add_parser_args(self, parser): - super(ImportCOREPOS, self).add_parser_args(parser) + super(ImportCOREPOSDB, self).add_parser_args(parser) parser.add_argument('--corepos-dbkey', metavar='KEY', default='default', help="Config key for CORE POS database engine to be used as the \"host\", " "i.e. the source of the data to be imported. This key " "must be " diff --git a/rattail_corepos/importing/corepos/__init__.py b/rattail_corepos/importing/corepos/__init__.py new file mode 100644 index 0000000..2ded185 --- /dev/null +++ b/rattail_corepos/importing/corepos/__init__.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8; -*- +################################################################################ +# +# Rattail -- Retail Software Framework +# Copyright © 2010-2020 Lance Edgar +# +# This file is part of Rattail. +# +# Rattail is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. +# +# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# Rattail. If not, see . +# +################################################################################ +""" +CORE POS -> Rattail data importing +""" + +# TODO: deprecate / remove this +from .db import * diff --git a/rattail_corepos/importing/corepos.py b/rattail_corepos/importing/corepos/db.py similarity index 99% rename from rattail_corepos/importing/corepos.py rename to rattail_corepos/importing/corepos/db.py index 1dd3e87..b53d816 100644 --- a/rattail_corepos/importing/corepos.py +++ b/rattail_corepos/importing/corepos/db.py @@ -21,7 +21,7 @@ # ################################################################################ """ -CORE POS -> Rattail data importing +CORE POS (DB) -> Rattail data importing """ import decimal diff --git a/setup.py b/setup.py index d5c0e0e..9b342a9 100644 --- a/setup.py +++ b/setup.py @@ -114,7 +114,7 @@ setup( 'rattail.commands': [ 'export-corepos = rattail_corepos.commands:ExportCore', 'corepos-import-square = rattail_corepos.commands:CoreImportSquare', - 'import-corepos = rattail_corepos.commands:ImportCOREPOS', + 'import-corepos-db = rattail_corepos.commands:ImportCOREPOSDB', ], },