From ff202415e330a2d26f3797f556b29ff57391bc44 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Jul 2024 12:32:20 -0500 Subject: [PATCH 1/6] fix: remove legacy command definitions --- pyproject.toml | 4 ---- rattail_harvest/commands.py | 11 +---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ab41dfa..3d93740 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,10 +35,6 @@ Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-harve 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"] rattail_harvest = "rattail_harvest.commands" diff --git a/rattail_harvest/commands.py b/rattail_harvest/commands.py index 7cc804b..c54848c 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, ImportSubcommand +from rattail.commands import rattail_typer from rattail.commands.typer import importer_command, typer_get_runas_user from rattail.commands.importing import ImportCommandHandler @@ -46,12 +46,3 @@ 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' From 0521f5e38cfae6266223c61c50537eb5187811fc Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Jul 2024 14:00:10 -0500 Subject: [PATCH 2/6] =?UTF-8?q?bump:=20version=200.3.0=20=E2=86=92=200.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 626eb8f..d35b2c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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.1 (2024-07-01) + +### Fix + +- remove legacy command definitions + ## v0.3.0 (2024-06-10) ### Feat diff --git a/pyproject.toml b/pyproject.toml index 3d93740..59a22d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-harvest" -version = "0.3.0" +version = "0.3.1" description = "Rattail integration package for Harvest" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 9687c8552954b864141d6c522d3689f1dd93dfe9 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 16 Aug 2024 13:32:56 -0500 Subject: [PATCH 3/6] fix: avoid deprecated base class for config extension --- rattail_harvest/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rattail_harvest/config.py b/rattail_harvest/config.py index 9fedb3e..93cc4d1 100644 --- a/rattail_harvest/config.py +++ b/rattail_harvest/config.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2022 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -24,10 +24,10 @@ Config Extension """ -from rattail.config import ConfigExtension +from wuttjamaican.conf import WuttaConfigExtension -class RattailHarvestExtension(ConfigExtension): +class RattailHarvestExtension(WuttaConfigExtension): """ Config extension for rattail-harvest. """ From df324159ba8809f8a19c3a860d8f26d5faa5f16b Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 18 Aug 2024 20:09:43 -0500 Subject: [PATCH 4/6] =?UTF-8?q?bump:=20version=200.3.1=20=E2=86=92=200.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d35b2c5..c1c7891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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 diff --git a/pyproject.toml b/pyproject.toml index 59a22d4..0880bb8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-harvest" -version = "0.3.1" +version = "0.3.2" description = "Rattail integration package for Harvest" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 69ce07a778efa44bcf937f14498ed70b466bbd8e Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 13 Sep 2024 18:38:44 -0500 Subject: [PATCH 5/6] docs: use markdown for readme file --- README.md | 11 +++++++++++ README.rst | 14 -------------- pyproject.toml | 2 +- 3 files changed, 12 insertions(+), 15 deletions(-) create mode 100644 README.md delete mode 100644 README.rst diff --git a/README.md b/README.md new file mode 100644 index 0000000..3a6e08e --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ + +# 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 deleted file mode 100644 index ab02203..0000000 --- a/README.rst +++ /dev/null @@ -1,14 +0,0 @@ - -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 0880bb8..c862f63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "hatchling.build" name = "rattail-harvest" version = "0.3.2" description = "Rattail integration package for Harvest" -readme = "README.rst" +readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] license = {text = "GNU GPL v3+"} classifiers = [ From e0b8797046c5d679bcac5c91b679d0580053883e Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 14 Sep 2024 13:20:04 -0500 Subject: [PATCH 6/6] docs: update project links, kallithea -> forgejo --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c862f63..8002dd2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,8 +31,8 @@ dependencies = [ [project.urls] Homepage = "https://rattailproject.org" -Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-harvest" -Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-harvest/files/master/CHANGELOG.md" +Repository = "https://forgejo.wuttaproject.org/rattail/rattail-harvest" +Changelog = "https://forgejo.wuttaproject.org/rattail/rattail-harvest/src/branch/master/CHANGELOG.md" [project.entry-points."rattail.typer_imports"]