From 902a2446341d3c9a8ea6fc2b8f5e0c2494fdbbdb Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 6 Jun 2024 18:51:14 -0500 Subject: [PATCH 1/9] Fix default dist filename for release task not sure why this fix was needed, did setuptools behavior change? --- tasks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks.py b/tasks.py index 0c51e8c..530c097 100644 --- a/tasks.py +++ b/tasks.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. # @@ -45,5 +45,5 @@ def release(c): c.run('python -m build --sdist') # upload to public PyPI - filename = 'rattail-wave-{}.tar.gz'.format(__version__) - c.run('twine upload dist/{}'.format(filename)) + filename = f'rattail_wave-{__version__}.tar.gz' + c.run(f'twine upload dist/{filename}') From c1a18e62561eb145afaa31f4d6cf4f5257741ec6 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 19:40:59 -0500 Subject: [PATCH 2/9] feat: switch from setup.cfg to pyproject.toml + hatchling --- .gitignore | 3 +++ pyproject.toml | 57 ++++++++++++++++++++++++++++++++++++++++ rattail_wave/_version.py | 5 +++- setup.cfg | 45 ------------------------------- setup.py | 29 -------------------- tasks.py | 13 ++++++++- 6 files changed, 76 insertions(+), 76 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.gitignore b/.gitignore index 7bac158..f3c1ace 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +*~ +*.pyc +dist/ rattail_wave.egg-info/ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..6aab2d9 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,57 @@ + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + + +[project] +name = "rattail-wave" +version = "0.2.0" +description = "Rattail integration package for Wave" +readme = "README.rst" +authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] +license = {text = "GNU GPL v3+"} +classifiers = [ + "Development Status :: 3 - Alpha", + "Environment :: Console", + "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 = [ + "invoke", + "rattail[db]", +] + + +[project.entry-points."rattail.subcommands"] +import-wave = "rattail_wave.commands:ImportWave" + + +[project.entry-points."rattail.typer_imports"] +rattail_wave = "rattail_wave.commands" + + +[project.entry-points."rattail.config.extensions"] +rattail_wave = "rattail_wave.config:RattailWaveExtension" + + +[project.entry-points."rattail.importing"] +"to_rattail.from_wave.import" = "rattail_wave.importing.wave:FromWaveToRattail" + + +[project.urls] +Homepage = "https://rattailproject.org" +Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-wave" +Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-wave/files/master/CHANGELOG.md" + + +[tool.commitizen] +version_provider = "pep621" +tag_format = "v$version" +update_changelog_on_bump = true diff --git a/rattail_wave/_version.py b/rattail_wave/_version.py index 08b390b..b3dab34 100644 --- a/rattail_wave/_version.py +++ b/rattail_wave/_version.py @@ -1,3 +1,6 @@ # -*- coding: utf-8; -*- -__version__ = '0.2.0' +from importlib.metadata import version + + +__version__ = version('rattail-wave') diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 06d7273..0000000 --- a/setup.cfg +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8; -*- - -[metadata] -name = rattail-wave -version = attr: rattail_wave.__version__ -author = Lance Edgar -author_email = lance@edbob.org -url = https://rattailproject.org/ -description = Rattail integration package for Wave -long_description = file: README.rst -classifiers = - Development Status :: 3 - Alpha - Environment :: Console - 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 = - invoke - rattail[db] - -packages = find: -include_package_data = True - - -[options.entry_points] - -rattail.subcommands = - import-wave = rattail_wave.commands:ImportWave - -rattail.typer_imports = - rattail_wave = rattail_wave.commands - -rattail.config.extensions = - rattail_wave = rattail_wave.config:RattailWaveExtension - -rattail.importing = - to_rattail.from_wave.import = rattail_wave.importing.wave:FromWaveToRattail diff --git a/setup.py b/setup.py deleted file mode 100644 index 4aed714..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-wave setup script -""" - -from setuptools import setup - -setup() diff --git a/tasks.py b/tasks.py index 530c097..5492e9f 100644 --- a/tasks.py +++ b/tasks.py @@ -25,13 +25,24 @@ Tasks for rattail-wave """ import os +import re import shutil from invoke import task here = os.path.abspath(os.path.dirname(__file__)) -exec(open(os.path.join(here, 'rattail_wave', '_version.py')).read()) +__version__ = None +pattern = re.compile(r'^version = "(\d+\.\d+\.\d+)"$') +with open(os.path.join(here, 'pyproject.toml'), 'rt') as f: + for line in f: + line = line.rstrip('\n') + match = pattern.match(line) + if match: + __version__ = match.group(1) + break +if not __version__: + raise RuntimeError("could not parse version!") @task From c82128cb60f998b5acf9f29ae1f7f473fe91d1f7 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 19:41:32 -0500 Subject: [PATCH 3/9] =?UTF-8?q?bump:=20version=200.2.0=20=E2=86=92=200.3.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, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a3afae..fd71818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ All notable changes to rattail-wave 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). -## Unreleased +## v0.3.0 (2024-06-10) + +### Feat + +- switch from setup.cfg to pyproject.toml + hatchling ## [0.2.0] - 2024-06-06 ### Changed diff --git a/pyproject.toml b/pyproject.toml index 6aab2d9..a31ee88 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-wave" -version = "0.2.0" +version = "0.3.0" description = "Rattail integration package for Wave" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From c923f71eb2b5f0a70f215a2cc2d713204537ac42 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Jul 2024 12:17:50 -0500 Subject: [PATCH 4/9] fix: remove legacy command definitions --- pyproject.toml | 4 ---- rattail_wave/commands.py | 11 +---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a31ee88..586a1e1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,10 +29,6 @@ dependencies = [ ] -[project.entry-points."rattail.subcommands"] -import-wave = "rattail_wave.commands:ImportWave" - - [project.entry-points."rattail.typer_imports"] rattail_wave = "rattail_wave.commands" diff --git a/rattail_wave/commands.py b/rattail_wave/commands.py index 9796ace..00586dc 100644 --- a/rattail_wave/commands.py +++ b/rattail_wave/commands.py @@ -26,7 +26,7 @@ rattail-wave 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_wave( config, import_handler_key='to_rattail.from_wave.import') kwargs['user'] = typer_get_runas_user(ctx) handler.run(kwargs, progress=progress) - - -class ImportWave(ImportSubcommand): - """ - Import data to Rattail, from Wave API - """ - name = 'import-wave' - description = __doc__.strip() - handler_key = 'to_rattail.from_wave.import' From f87f602e59ac48408ada91ffcc61752c5796b21a Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Jul 2024 14:00:45 -0500 Subject: [PATCH 5/9] =?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 fd71818..0ed74c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to rattail-wave 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 586a1e1..f9bb78f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-wave" -version = "0.3.0" +version = "0.3.1" description = "Rattail integration package for Wave" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From ef6e50e3a9b64d1c58270ca06810eb61c25f3c1f Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 16 Aug 2024 13:33:32 -0500 Subject: [PATCH 6/9] fix: avoid deprecated base class for config extension --- rattail_wave/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rattail_wave/config.py b/rattail_wave/config.py index 0c7f9e6..fb68972 100644 --- a/rattail_wave/config.py +++ b/rattail_wave/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 RattailWaveExtension(ConfigExtension): +class RattailWaveExtension(WuttaConfigExtension): """ Config extension for rattail-wave. """ From 7d75c11468cdb0514c2622c73b002f97e2b82733 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 18 Aug 2024 20:10:29 -0500 Subject: [PATCH 7/9] =?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 0ed74c9..030ad96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to rattail-wave 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 f9bb78f..1fa0350 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail-wave" -version = "0.3.1" +version = "0.3.2" description = "Rattail integration package for Wave" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 7823f3f1b16880ee741e2684d5db9e3ddbd38b1e Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 13 Sep 2024 18:19:51 -0500 Subject: [PATCH 8/9] 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..53e91b2 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ + +# rattail-wave + +Rattail is a retail software framework, released under the GNU General +Public License. + +This package contains software interfaces for +[Wave](https://www.waveapps.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 7e17f4c..0000000 --- a/README.rst +++ /dev/null @@ -1,14 +0,0 @@ - -rattail-wave -============ - -Rattail is a retail software framework, released under the GNU General -Public License. - -This package contains software interfaces for `Wave`_. - -.. _`Wave`: https://www.waveapps.com/ - -Please see the `Rattail Project`_ for more information. - -.. _`Rattail Project`: https://rattailproject.org/ diff --git a/pyproject.toml b/pyproject.toml index 1fa0350..e444173 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "hatchling.build" name = "rattail-wave" version = "0.3.2" description = "Rattail integration package for Wave" -readme = "README.rst" +readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] license = {text = "GNU GPL v3+"} classifiers = [ From f23d33bbe94c5ab5848f1b40167de7f6f62753ed Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 14 Sep 2024 12:48:37 -0500 Subject: [PATCH 9/9] 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 e444173..ae4c88a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,8 +43,8 @@ rattail_wave = "rattail_wave.config:RattailWaveExtension" [project.urls] Homepage = "https://rattailproject.org" -Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-wave" -Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-wave/files/master/CHANGELOG.md" +Repository = "https://forgejo.wuttaproject.org/rattail/rattail-wave" +Changelog = "https://forgejo.wuttaproject.org/rattail/rattail-wave/src/branch/master/CHANGELOG.md" [tool.commitizen]