CHANGELOG.md

@@ -5,31 +5,6 @@ All notable changes to rattail-nationbuilder 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.4 (2024-08-19)
-
-### Fix
-
-- avoid deprecated method in app provider
-- avoid deprecated base class for config extension
-
-## v0.3.3 (2024-08-19)
-
-### Fix
-
-- avoid deprecated import for `parse_list()`
-
-## v0.3.2 (2024-08-13)
-
-### Fix
-
-- update app provider entry point, per wuttjamaican
-
-## v0.3.1 (2024-07-01)
-
-### Fix
-
-- remove legacy command definitions
-
 ## v0.3.0 (2024-06-10)
 
 ### Feat

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rattail-nationbuilder"
-version = "0.3.4"
+version = "0.3.0"
 description = "Rattail integration package for NationBuilder"
 readme = "README.md"
 authors = [{name = "Lance Edgar", email = "lance@edbob.org"}]
@@ -27,6 +27,10 @@ dependencies = [
 ]
 
 
+[project.entry-points."rattail.subcommands"]
+import-nationbuilder = "rattail_nationbuilder.commands:ImportNationBuilder"
+
+
 [project.entry-points."rattail.typer_imports"]
 rattail_nationbuilder = "rattail_nationbuilder.commands"
 
@@ -39,14 +43,14 @@ rattail_nationbuilder = "rattail_nationbuilder.config:RattailNationBuilderExtens
 "to_rattail.from_nationbuilder.import" = "rattail_nationbuilder.importing.nationbuilder:FromNationBuilderToRattail"
 
 
-[project.entry-points."wutta.app.providers"]
+[project.entry-points."rattail.providers"]
 rattail_nationbuilder = "rattail_nationbuilder.app:NationBuilderProvider"
 
 
 [project.urls]
 Homepage = "https://rattailproject.org"
-Repository = "https://forgejo.wuttaproject.org/rattail/rattail-nationbuilder"
-Changelog = "https://forgejo.wuttaproject.org/rattail/rattail-nationbuilder/src/branch/master/CHANGELOG.md"
+Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-nationbuilder"
+Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-nationbuilder/files/master/CHANGELOG.md"
 
 
 [tool.commitizen]

rattail_nationbuilder/app.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2024 Lance Edgar
+#  Copyright © 2010-2023 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -36,7 +36,7 @@ class NationBuilderProvider(RattailProvider):
         if 'nationbuilder' not in self.handlers:
             spec = self.config.get('rattail', 'nationbuilder.handler',
                                    default='rattail_nationbuilder.app:NationBuilderHandler')
-            factory = self.app.load_object(spec)
+            factory = self.load_object(spec)
             self.handlers['nationbuilder'] = factory(self.config, **kwargs)
         return self.handlers['nationbuilder']
 

rattail_nationbuilder/commands.py

@@ -26,7 +26,7 @@ rattail-nationbuilder 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_nationbuilder(
         config, import_handler_key='to_rattail.from_nationbuilder.import')
     kwargs['user'] = typer_get_runas_user(ctx)
     handler.run(kwargs, progress=progress)
+
+
+class ImportNationBuilder(ImportSubcommand):
+    """
+    Import data for NationBuilder => Rattail
+    """
+    name = 'import-nationbuilder'
+    description = __doc__.strip()
+    handler_key = 'to_rattail.from_nationbuilder.import'

rattail_nationbuilder/config.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2024 Lance Edgar
+#  Copyright © 2010-2023 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 RattailNationBuilderExtension(WuttaConfigExtension):
+class RattailNationBuilderExtension(ConfigExtension):
     """
     Config extension for rattail-nationbuilder
     """
@@ -36,7 +36,7 @@ class RattailNationBuilderExtension(WuttaConfigExtension):
     def configure(self, config):
 
         # rattail import-nationbuilder
-        config.setdefault('rattail.importing.to_rattail.from_nationbulder.import.default_handler',
+        config.setdefault('rattail.importing', 'to_rattail.from_nationbulder.import.default_handler',
                           'rattail_nationbuilder.importing.nationbuilder:FromNationBuilderToRattail')
-        config.setdefault('rattail.importing.to_rattail.from_nationbuilder.import.default_cmd',
+        config.setdefault('rattail.importing', 'to_rattail.from_nationbuilder.import.default_cmd',
                           'rattail import-nationbuilder')

rattail_nationbuilder/db/model/nationbuilder.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2024 Lance Edgar
+#  Copyright © 2010-2023 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -27,10 +27,9 @@ NationBuilder cache tables
 import sqlalchemy as sa
 from sqlalchemy import orm
 
-from wuttjamaican.util import parse_list
-
 from rattail.db import model
 from rattail.db.util import normalize_full_name
+from rattail.config import parse_list
 
 
 class NationBuilderCachePerson(model.Base):