diff --git a/CHANGELOG.md b/CHANGELOG.md index c1c7891..626eb8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,18 +5,6 @@ All notable changes to rattail-harvest will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## v0.3.2 (2024-08-18) - -### Fix - -- avoid deprecated base class for config extension - -## v0.3.1 (2024-07-01) - -### Fix - -- remove legacy command definitions - ## v0.3.0 (2024-06-10) ### Feat diff --git a/README.md b/README.md deleted file mode 100644 index 3a6e08e..0000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ - -# rattail-harvest - -Rattail is a retail software framework, released under the GNU General -Public License. - -This package contains software interfaces for -[Harvest](https://www.getharvest.com/). - -Please see the [Rattail Project](https://rattailproject.org/) for more -information. diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..ab02203 --- /dev/null +++ b/README.rst @@ -0,0 +1,14 @@ + +rattail-harvest +=============== + +Rattail is a retail software framework, released under the GNU General +Public License. + +This package contains software interfaces for `Harvest`_. + +.. _`Harvest`: https://www.getharvest.com/ + +Please see the `Rattail Project`_ for more information. + +.. _`Rattail Project`: https://rattailproject.org/ diff --git a/pyproject.toml b/pyproject.toml index 8002dd2..ab41dfa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,9 +6,9 @@ build-backend = "hatchling.build" [project] name = "rattail-harvest" -version = "0.3.2" +version = "0.3.0" description = "Rattail integration package for Harvest" -readme = "README.md" +readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] license = {text = "GNU GPL v3+"} classifiers = [ @@ -31,8 +31,12 @@ dependencies = [ [project.urls] Homepage = "https://rattailproject.org" -Repository = "https://forgejo.wuttaproject.org/rattail/rattail-harvest" -Changelog = "https://forgejo.wuttaproject.org/rattail/rattail-harvest/src/branch/master/CHANGELOG.md" +Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-harvest" +Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-harvest/files/master/CHANGELOG.md" + + +[project.entry-points."rattail.subcommands"] +import-harvest = "rattail_harvest.commands:ImportHarvest" [project.entry-points."rattail.typer_imports"] diff --git a/rattail_harvest/commands.py b/rattail_harvest/commands.py index c54848c..7cc804b 100644 --- a/rattail_harvest/commands.py +++ b/rattail_harvest/commands.py @@ -26,7 +26,7 @@ rattail-harvest commands import typer -from rattail.commands import rattail_typer +from rattail.commands import rattail_typer, ImportSubcommand from rattail.commands.typer import importer_command, typer_get_runas_user from rattail.commands.importing import ImportCommandHandler @@ -46,3 +46,12 @@ def import_harvest( config, import_handler_key='to_rattail.from_harvest.import') kwargs['user'] = typer_get_runas_user(ctx) handler.run(kwargs, progress=progress) + + +class ImportHarvest(ImportSubcommand): + """ + Import data to Rattail, from Harvest API + """ + name = 'import-harvest' + description = __doc__.strip() + handler_key = 'to_rattail.from_harvest.import' diff --git a/rattail_harvest/config.py b/rattail_harvest/config.py index 93cc4d1..9fedb3e 100644 --- a/rattail_harvest/config.py +++ b/rattail_harvest/config.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2024 Lance Edgar +# Copyright © 2010-2022 Lance Edgar # # This file is part of Rattail. # @@ -24,10 +24,10 @@ Config Extension """ -from wuttjamaican.conf import WuttaConfigExtension +from rattail.config import ConfigExtension -class RattailHarvestExtension(WuttaConfigExtension): +class RattailHarvestExtension(ConfigExtension): """ Config extension for rattail-harvest. """