From b04816b1ef4c6db390c89847082b4dfc2dd09ce6 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 16 May 2024 20:13:01 -0500 Subject: [PATCH 01/15] Add typer equivalents for `rattail` commands --- rattail_nationbuilder/commands.py | 27 ++++++++++++++++++++++++--- setup.cfg | 3 +++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/rattail_nationbuilder/commands.py b/rattail_nationbuilder/commands.py index de3456a..ccfb9bc 100644 --- a/rattail_nationbuilder/commands.py +++ b/rattail_nationbuilder/commands.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -24,10 +24,31 @@ rattail-nationbuilder commands """ -from rattail import commands +import 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 -class ImportNationBuilder(commands.ImportSubcommand): +@rattail_typer.command() +@importer_command +def import_nationbuilder( + ctx: typer.Context, + **kwargs +): + """ + Import data for NationBuilder => Rattail + """ + config = ctx.parent.rattail_config + progress = ctx.parent.rattail_progress + handler = ImportCommandHandler( + 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 """ diff --git a/setup.cfg b/setup.cfg index da55360..9dcabe7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,6 +34,9 @@ include_package_data = True rattail.subcommands = import-nationbuilder = rattail_nationbuilder.commands:ImportNationBuilder +rattail.typer_imports = + rattail_nationbuilder = rattail_nationbuilder.commands + rattail.config.extensions = rattail_nationbuilder = rattail_nationbuilder.config:RattailNationBuilderExtension From 0e0823e04397a53854085bf9165a482a7a76a0d0 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 29 May 2024 10:14:17 -0500 Subject: [PATCH 02/15] Update changelog --- CHANGELOG.md | 4 ++++ rattail_nationbuilder/_version.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb8fedf..10161df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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). +## [0.2.0] - 2024-05-29 +### Changed +- Migrate all commands to use `typer`. + ## [0.1.14] - 2023-12-01 ### Changed - Update subcommand entry point group names, per wuttjamaican. diff --git a/rattail_nationbuilder/_version.py b/rattail_nationbuilder/_version.py index 19bf267..08b390b 100644 --- a/rattail_nationbuilder/_version.py +++ b/rattail_nationbuilder/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.1.14' +__version__ = '0.2.0' From 55a7c4a9be2537c7289d2dad4042a2b337b35842 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 29 May 2024 10:15:24 -0500 Subject: [PATCH 03/15] Fix default dist filename for release task not sure why this fix was needed, did setuptools behavior change? --- tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks.py b/tasks.py index cb2927f..f01dabb 100644 --- a/tasks.py +++ b/tasks.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -45,7 +45,7 @@ def release(c): c.run('python -m build --sdist') # filename of built package - filename = 'rattail-nationbuilder-{}.tar.gz'.format(__version__) + filename = f'rattail_nationbuilder-{__version__}.tar.gz' # upload to PyPI c.run('twine upload dist/{}'.format(filename)) From 3216d27359790e58e293c4d4bcbad26a6cf9fa1b Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 22:52:09 -0500 Subject: [PATCH 04/15] feat: switch from setup.cfg to pyproject.toml + hatchling --- .gitignore | 3 ++ pyproject.toml | 59 +++++++++++++++++++++++++++++++ rattail_nationbuilder/_version.py | 5 ++- setup.cfg | 47 ------------------------ setup.py | 29 --------------- tasks.py | 13 +++---- 6 files changed, 70 insertions(+), 86 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.gitignore b/.gitignore index 46993f4..89b3100 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +*~ +*.pyc +dist/ rattail_nationbuilder.egg-info/ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..72899ea --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,59 @@ + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + + +[project] +name = "rattail-nationbuilder" +version = "0.2.0" +description = "Rattail integration package for NationBuilder" +readme = "README.md" +authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] +license = {text = "GNU GPL v3+"} +classifiers = [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Natural Language :: English", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Topic :: Office/Business", + "Topic :: Software Development :: Libraries :: Python Modules", +] +dependencies = [ + "rattail", +] + + +[project.entry-points."rattail.subcommands"] +import-nationbuilder = "rattail_nationbuilder.commands:ImportNationBuilder" + + +[project.entry-points."rattail.typer_imports"] +rattail_nationbuilder = "rattail_nationbuilder.commands" + + +[project.entry-points."rattail.config.extensions"] +rattail_nationbuilder = "rattail_nationbuilder.config:RattailNationBuilderExtension" + + +[project.entry-points."rattail.importing"] +"to_rattail.from_nationbuilder.import" = "rattail_nationbuilder.importing.nationbuilder:FromNationBuilderToRattail" + + +[project.entry-points."rattail.providers"] +rattail_nationbuilder = "rattail_nationbuilder.app:NationBuilderProvider" + + +[project.urls] +Homepage = "https://rattailproject.org" +Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-nationbuilder" +Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-nationbuilder/files/master/CHANGELOG.md" + + +[tool.commitizen] +version_provider = "pep621" +tag_format = "v$version" +update_changelog_on_bump = true diff --git a/rattail_nationbuilder/_version.py b/rattail_nationbuilder/_version.py index 08b390b..ab7b619 100644 --- a/rattail_nationbuilder/_version.py +++ b/rattail_nationbuilder/_version.py @@ -1,3 +1,6 @@ # -*- coding: utf-8; -*- -__version__ = '0.2.0' +from importlib.metadata import version + + +__version__ = version('rattail-nationbuilder') diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 9dcabe7..0000000 --- a/setup.cfg +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8; -*- - -[metadata] -name = rattail-nationbuilder -version = attr: rattail_nationbuilder.__version__ -author = Lance Edgar -author_email = lance@edbob.org -url = https://rattailproject.org/ -license = GNU GPL v3 -description = Rattail integration package for NationBuilder -long_description = file: README.md -classifiers = - Development Status :: 4 - Beta - Intended Audience :: Developers - License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) - Natural Language :: English - Operating System :: OS Independent - Programming Language :: Python - Programming Language :: Python :: 3 - Topic :: Office/Business - Topic :: Software Development :: Libraries :: Python Modules - - -[options] -install_requires = - rattail - -packages = find: -include_package_data = True - - -[options.entry_points] - -rattail.subcommands = - import-nationbuilder = rattail_nationbuilder.commands:ImportNationBuilder - -rattail.typer_imports = - rattail_nationbuilder = rattail_nationbuilder.commands - -rattail.config.extensions = - rattail_nationbuilder = rattail_nationbuilder.config:RattailNationBuilderExtension - -rattail.importing = - to_rattail.from_nationbuilder.import = rattail_nationbuilder.importing.nationbuilder:FromNationBuilderToRattail - -rattail.providers = - rattail_nationbuilder = rattail_nationbuilder.app:NationBuilderProvider diff --git a/setup.py b/setup.py deleted file mode 100644 index db55b4b..0000000 --- a/setup.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8; -*- -################################################################################ -# -# Rattail -- Retail Software Framework -# Copyright © 2010-2023 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 . -# -################################################################################ -""" -rattail-nationbuilder setup script -""" - -from setuptools import setup - -setup() diff --git a/tasks.py b/tasks.py index f01dabb..20fb0d4 100644 --- a/tasks.py +++ b/tasks.py @@ -30,22 +30,17 @@ import shutil from invoke import task -here = os.path.abspath(os.path.dirname(__file__)) -exec(open(os.path.join(here, 'rattail_nationbuilder', '_version.py')).read()) - - @task def release(c): """ Release a new version of rattail-nationbuilder """ - # rebuild local tar.gz file for distribution + # rebuild package + if os.path.exists('dist'): + shutil.rmtree('dist') if os.path.exists('rattail_nationbuilder.egg-info'): shutil.rmtree('rattail_nationbuilder.egg-info') c.run('python -m build --sdist') - # filename of built package - filename = f'rattail_nationbuilder-{__version__}.tar.gz' - # upload to PyPI - c.run('twine upload dist/{}'.format(filename)) + c.run('twine upload dist/*') From d503de44a24b47566464efca93d20f075c53ccc9 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 22:52:27 -0500 Subject: [PATCH 05/15] =?UTF-8?q?bump:=20version=200.2.0=20=E2=86=92=200.3?= =?UTF-8?q?.0?= 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 10161df..5c9b29c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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.0 (2024-06-10) + +### Feat + +- switch from setup.cfg to pyproject.toml + hatchling + ## [0.2.0] - 2024-05-29 ### Changed - Migrate all commands to use `typer`. diff --git a/pyproject.toml b/pyproject.toml index 72899ea..85dcb47 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-nationbuilder" -version = "0.2.0" +version = "0.3.0" description = "Rattail integration package for NationBuilder" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From adbf48ba5777e3760bc31245c89c3d65286f573d Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Jul 2024 12:24:21 -0500 Subject: [PATCH 06/15] fix: remove legacy command definitions --- pyproject.toml | 4 ---- rattail_nationbuilder/commands.py | 11 +---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 85dcb47..84bbd6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,10 +27,6 @@ dependencies = [ ] -[project.entry-points."rattail.subcommands"] -import-nationbuilder = "rattail_nationbuilder.commands:ImportNationBuilder" - - [project.entry-points."rattail.typer_imports"] rattail_nationbuilder = "rattail_nationbuilder.commands" diff --git a/rattail_nationbuilder/commands.py b/rattail_nationbuilder/commands.py index ccfb9bc..707de46 100644 --- a/rattail_nationbuilder/commands.py +++ b/rattail_nationbuilder/commands.py @@ -26,7 +26,7 @@ rattail-nationbuilder 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_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' From 46c07567fe2c5b915f600385d4f898c50ac32b7c Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Jul 2024 14:15:10 -0500 Subject: [PATCH 07/15] =?UTF-8?q?bump:=20version=200.3.0=20=E2=86=92=200.3?= =?UTF-8?q?.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 5c9b29c..b974e81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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.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 84bbd6b..69f0a42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-nationbuilder" -version = "0.3.0" +version = "0.3.1" description = "Rattail integration package for NationBuilder" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From d44c69308015ea341d520f33b006556acd15db01 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 14 Jul 2024 12:46:08 -0500 Subject: [PATCH 08/15] fix: update app provider entry point, per wuttjamaican --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 69f0a42..07e3a74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ rattail_nationbuilder = "rattail_nationbuilder.config:RattailNationBuilderExtens "to_rattail.from_nationbuilder.import" = "rattail_nationbuilder.importing.nationbuilder:FromNationBuilderToRattail" -[project.entry-points."rattail.providers"] +[project.entry-points."wutta.app.providers"] rattail_nationbuilder = "rattail_nationbuilder.app:NationBuilderProvider" From 69e2720e93c24492c6573712a4cd549372651fd0 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 13 Aug 2024 11:25:20 -0500 Subject: [PATCH 09/15] =?UTF-8?q?bump:=20version=200.3.1=20=E2=86=92=200.3?= =?UTF-8?q?.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 b974e81..8315ab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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.2 (2024-08-13) + +### Fix + +- update app provider entry point, per wuttjamaican + ## v0.3.1 (2024-07-01) ### Fix diff --git a/pyproject.toml b/pyproject.toml index 07e3a74..e4c6c23 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-nationbuilder" -version = "0.3.1" +version = "0.3.2" description = "Rattail integration package for NationBuilder" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From dfe820455b50658f26dc0cb96bea3d5901fc0092 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 14 Aug 2024 11:16:28 -0500 Subject: [PATCH 10/15] fix: avoid deprecated import for `parse_list()` --- rattail_nationbuilder/db/model/nationbuilder.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rattail_nationbuilder/db/model/nationbuilder.py b/rattail_nationbuilder/db/model/nationbuilder.py index 12fdbc6..6f08e09 100644 --- a/rattail_nationbuilder/db/model/nationbuilder.py +++ b/rattail_nationbuilder/db/model/nationbuilder.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -27,9 +27,10 @@ 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): From edbe306bdfa0f1214ed49a08f119ba092ca924c7 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 19 Aug 2024 09:38:45 -0500 Subject: [PATCH 11/15] =?UTF-8?q?bump:=20version=200.3.2=20=E2=86=92=200.3?= =?UTF-8?q?.3?= 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 8315ab1..94deadf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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.3 (2024-08-19) + +### Fix + +- avoid deprecated import for `parse_list()` + ## v0.3.2 (2024-08-13) ### Fix diff --git a/pyproject.toml b/pyproject.toml index e4c6c23..fc11ee5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-nationbuilder" -version = "0.3.2" +version = "0.3.3" description = "Rattail integration package for NationBuilder" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 253791134a269763bd8c8f48ea10e192ca9c07ad Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 19 Aug 2024 09:42:17 -0500 Subject: [PATCH 12/15] fix: avoid deprecated base class for config extension --- rattail_nationbuilder/config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rattail_nationbuilder/config.py b/rattail_nationbuilder/config.py index de2aef3..0c6fa3c 100644 --- a/rattail_nationbuilder/config.py +++ b/rattail_nationbuilder/config.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 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 RattailNationBuilderExtension(ConfigExtension): +class RattailNationBuilderExtension(WuttaConfigExtension): """ Config extension for rattail-nationbuilder """ @@ -36,7 +36,7 @@ class RattailNationBuilderExtension(ConfigExtension): 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') From d1d181bb43d704b993809662bb828764d9923bf0 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 19 Aug 2024 09:55:54 -0500 Subject: [PATCH 13/15] fix: avoid deprecated method in app provider --- rattail_nationbuilder/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rattail_nationbuilder/app.py b/rattail_nationbuilder/app.py index 0fa8ccb..e18f15f 100644 --- a/rattail_nationbuilder/app.py +++ b/rattail_nationbuilder/app.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 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.load_object(spec) + factory = self.app.load_object(spec) self.handlers['nationbuilder'] = factory(self.config, **kwargs) return self.handlers['nationbuilder'] From 785b32c5f00bcb33e55128999fcad0a715244eea Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 19 Aug 2024 12:03:21 -0500 Subject: [PATCH 14/15] =?UTF-8?q?bump:=20version=200.3.3=20=E2=86=92=200.3?= =?UTF-8?q?.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94deadf..1df7dfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ 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 diff --git a/pyproject.toml b/pyproject.toml index fc11ee5..c46b60a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-nationbuilder" -version = "0.3.3" +version = "0.3.4" description = "Rattail integration package for NationBuilder" readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 5a6c89589ea85d9f2a852af52c56338deb9b5212 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 14 Sep 2024 12:10:25 -0500 Subject: [PATCH 15/15] 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 c46b60a..d484943 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,8 +45,8 @@ rattail_nationbuilder = "rattail_nationbuilder.app:NationBuilderProvider" [project.urls] Homepage = "https://rattailproject.org" -Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-nationbuilder" -Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-nationbuilder/files/master/CHANGELOG.md" +Repository = "https://forgejo.wuttaproject.org/rattail/rattail-nationbuilder" +Changelog = "https://forgejo.wuttaproject.org/rattail/rattail-nationbuilder/src/branch/master/CHANGELOG.md" [tool.commitizen]