From 6eb483fe90c311673df482592384a952ca8e0a59 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 6 Jun 2024 18:26:47 -0500 Subject: [PATCH 1/7] Fix default dist filename for release task not sure why this fix was needed, did setuptools behavior change? --- tasks.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks.py b/tasks.py index 88b264a..fea43cf 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. # @@ -35,14 +35,14 @@ exec(open(os.path.join(here, 'tailbone_harvest', '_version.py')).read()) @task -def release(ctx): +def release(c): """ Release a new version of tailbone-harvest """ # rebuild local tar.gz file for distribution shutil.rmtree('tailbone_harvest.egg-info') - ctx.run('python setup.py sdist --formats=gztar') + c.run('python setup.py sdist --formats=gztar') # upload to public PyPI - filename = 'tailbone-harvest-{}.tar.gz'.format(__version__) - ctx.run('twine upload dist/{}'.format(filename)) + filename = f'tailbone_harvest-{__version__}.tar.gz' + c.run(f'twine upload dist/{filename}') From 29c3429d2e0aad3857433c4571e558cc2a74ee77 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 19:35:42 -0500 Subject: [PATCH 2/7] feat: switch from setup.cfg to pyproject.toml + hatchling --- .gitignore | 3 ++ pyproject.toml | 58 ++++++++++++++++++++++++++++++++++++ setup.cfg | 31 ------------------- setup.py | 29 ------------------ tailbone_harvest/_version.py | 5 +++- tasks.py | 18 +++++++++-- 6 files changed, 80 insertions(+), 64 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.gitignore b/.gitignore index 6ee5074..40ca5bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +*~ +*.pyc +dist/ tailbone_harvest.egg-info/ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..8f70171 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,58 @@ + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + + +[project] +name = "tailbone-harvest" +version = "0.2.0" +description = "Tailbone integration package for Harvest" +readme = "README.rst" +authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] +license = {text = "GNU GPL v3+"} +classifiers = [ + "Development Status :: 3 - Alpha", + "Environment :: Web Environment", + "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-harvest", + "Tailbone", +] + + +[project.urls] +Homepage = "https://rattailproject.org" +Repository = "https://kallithea.rattailproject.org/rattail-project/tailbone-harvest" +Changelog = "https://kallithea.rattailproject.org/rattail-project/tailbone-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" + + +[project.entry-points."rattail.config.extensions"] +rattail_harvest = "rattail_harvest.config:RattailHarvestExtension" + + +[project.entry-points."rattail.importing"] +"to_rattail.from_harvest.import" = "rattail_harvest.importing.harvest:FromHarvestToRattail" + + +[tool.commitizen] +version_provider = "pep621" +tag_format = "v$version" +update_changelog_on_bump = true diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 928158a..0000000 --- a/setup.cfg +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8; -*- - -[metadata] -name = tailbone-harvest -version = attr: tailbone_harvest.__version__ -author = Lance Edgar -author_email = lance@edbob.org -url = https://rattailproject.org/ -description = Tailbone integration package for Harvest -long_description = file: README.rst -classifiers = - Development Status :: 3 - Alpha - Environment :: Web Environment - 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-harvest - Tailbone - -packages = find: -include_package_data = True diff --git a/setup.py b/setup.py deleted file mode 100644 index 3b73b9a..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 . -# -################################################################################ -""" -tailbone-harvest setup script -""" - -from setuptools import setup - -setup() diff --git a/tailbone_harvest/_version.py b/tailbone_harvest/_version.py index 08b390b..0e7a01b 100644 --- a/tailbone_harvest/_version.py +++ b/tailbone_harvest/_version.py @@ -1,3 +1,6 @@ # -*- coding: utf-8; -*- -__version__ = '0.2.0' +from importlib.metadata import version + + +__version__ = version('tailbone-harvest') diff --git a/tasks.py b/tasks.py index fea43cf..c4ed484 100644 --- a/tasks.py +++ b/tasks.py @@ -25,13 +25,24 @@ Tasks for tailbone-harvest """ import os +import re import shutil from invoke import task here = os.path.abspath(os.path.dirname(__file__)) -exec(open(os.path.join(here, 'tailbone_harvest', '_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 @@ -40,8 +51,9 @@ def release(c): Release a new version of tailbone-harvest """ # rebuild local tar.gz file for distribution - shutil.rmtree('tailbone_harvest.egg-info') - c.run('python setup.py sdist --formats=gztar') + if os.path.exists('tailbone_harvest.egg-info'): + shutil.rmtree('tailbone_harvest.egg-info') + c.run('python -m build --sdist') # upload to public PyPI filename = f'tailbone_harvest-{__version__}.tar.gz' From 945d595329afb7ca01b8b4e67cdc4a76f690d085 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 19:35:55 -0500 Subject: [PATCH 3/7] =?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, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 208ab65..27c246c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to tailbone-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.0 (2024-06-10) + +### Feat + +- switch from setup.cfg to pyproject.toml + hatchling + ## [0.2.0] - 2024-06-06 Catch-up release. ### Changed diff --git a/pyproject.toml b/pyproject.toml index 8f70171..5537117 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "tailbone-harvest" -version = "0.2.0" +version = "0.3.0" description = "Tailbone integration package for Harvest" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 52a1d15f7ab8054ad6fe737985e4a6ac8cfae0cb Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Jul 2024 12:33:05 -0500 Subject: [PATCH 4/7] fix: remove incorrect entry points missed these when copy-pasting apparently --- pyproject.toml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5537117..7c359a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,22 +36,6 @@ Repository = "https://kallithea.rattailproject.org/rattail-project/tailbone-harv Changelog = "https://kallithea.rattailproject.org/rattail-project/tailbone-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" - - -[project.entry-points."rattail.config.extensions"] -rattail_harvest = "rattail_harvest.config:RattailHarvestExtension" - - -[project.entry-points."rattail.importing"] -"to_rattail.from_harvest.import" = "rattail_harvest.importing.harvest:FromHarvestToRattail" - - [tool.commitizen] version_provider = "pep621" tag_format = "v$version" From 5884901d75834cb57efd4c45130ec1c521be1b71 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Jul 2024 14:02:13 -0500 Subject: [PATCH 5/7] =?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 27c246c..0728aeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to tailbone-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 incorrect entry points + ## v0.3.0 (2024-06-10) ### Feat diff --git a/pyproject.toml b/pyproject.toml index 7c359a0..830cad9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "tailbone-harvest" -version = "0.3.0" +version = "0.3.1" description = "Tailbone integration package for Harvest" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 65b9d059e8161d3ef20d94c1e1c690a030cd0d81 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 13 Sep 2024 18:11:51 -0500 Subject: [PATCH 6/7] 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..ec86877 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ + +# tailbone-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 4866f29..0000000 --- a/README.rst +++ /dev/null @@ -1,14 +0,0 @@ - -tailbone-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 830cad9..70192c2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "hatchling.build" name = "tailbone-harvest" version = "0.3.1" description = "Tailbone 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 212e6ffc920b0551d1da5bcd6911b1ed36e02819 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 14 Sep 2024 12:13:24 -0500 Subject: [PATCH 7/7] 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 70192c2..e9ffcd3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,8 +32,8 @@ dependencies = [ [project.urls] Homepage = "https://rattailproject.org" -Repository = "https://kallithea.rattailproject.org/rattail-project/tailbone-harvest" -Changelog = "https://kallithea.rattailproject.org/rattail-project/tailbone-harvest/files/master/CHANGELOG.md" +Repository = "https://forgejo.wuttaproject.org/rattail/tailbone-harvest" +Changelog = "https://forgejo.wuttaproject.org/rattail/tailbone-harvest/src/branch/master/CHANGELOG.md" [tool.commitizen]