From 1c39dbd881f68d1cfb2861630367985b4457fc45 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 19:04:06 -0500 Subject: [PATCH] feat: switch from setup.cfg to pyproject.toml + hatchling --- .gitignore | 2 ++ pyproject.toml | 50 ++++++++++++++++++++++++++++++++++++ setup.cfg | 41 ----------------------------- setup.py | 26 ------------------- tailbone_corepos/_version.py | 5 +++- tasks.py | 18 ++++++++++--- 6 files changed, 71 insertions(+), 71 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.gitignore b/.gitignore index b82aa68..1599faf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +*~ *.pyc +dist/ tailbone_corepos.egg-info/ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..1c0b990 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,50 @@ + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + + +[project] +name = "tailbone-corepos" +version = "0.1.39" +description = "Tailbone interfaces for CORE POS" +readme = "README.rst" +authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] +license = {text = "GNU GPL v3+"} +classifiers = [ + "Development Status :: 4 - Beta", + "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", + "Programming Language :: Python :: 3.5", + "Topic :: Office/Business", + "Topic :: Software Development :: Libraries :: Python Modules", +] + +dependencies = [ + "rattail", + "rattail-corepos", + "six", + "Tailbone", +] + + +[project.urls] +Homepage = "https://redmine.rattailproject.org/projects/corepos-integration" +Repository = "https://kallithea.rattailproject.org/rattail-project/tailbone-corepos" +Issues = "https://redmine.rattailproject.org/projects/corepos-integration/issues" +Changelog = "https://kallithea.rattailproject.org/rattail-project/tailbone-corepos/files/master/CHANGELOG.md" + + +[project.entry-points."tailbone.providers"] +tailbone_corepos = "tailbone_corepos.provider:TailboneCorePosProvider" + + +[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 52b267a..0000000 --- a/setup.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8; -*- - -[metadata] -name = tailbone-corepos -version = attr: tailbone_corepos.__version__ -author = Lance Edgar -author_email = lance@edbob.org -url = https://rattailproject.org/ -license = GNU GPL v3 -description = Tailbone interfaces for CORE POS -long_description = file: README.rst -classifiers = - Development Status :: 4 - Beta - 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 - Programming Language :: Python :: 3.5 - Topic :: Office/Business - Topic :: Software Development :: Libraries :: Python Modules - - -[options] -install_requires = - rattail - rattail-corepos - six - Tailbone - -packages = find: -include_package_data = True -zip_safe = False - - -[options.entry_points] - -tailbone.providers = - tailbone_corepos = tailbone_corepos.provider:TailboneCorePosProvider diff --git a/setup.py b/setup.py deleted file mode 100644 index 615bc06..0000000 --- a/setup.py +++ /dev/null @@ -1,26 +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 . -# -################################################################################ - -from setuptools import setup - -setup() diff --git a/tailbone_corepos/_version.py b/tailbone_corepos/_version.py index 4d5272e..da0d3d4 100644 --- a/tailbone_corepos/_version.py +++ b/tailbone_corepos/_version.py @@ -1,3 +1,6 @@ # -*- coding: utf-8; -*- -__version__ = '0.1.39' +from importlib.metadata import version + + +__version__ = version('tailbone-corepos') diff --git a/tasks.py b/tasks.py index 6d4430b..bbece68 100644 --- a/tasks.py +++ b/tasks.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2019 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -25,13 +25,24 @@ Tasks for tailbone-corepos """ 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_corepos', '_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 @@ -39,7 +50,8 @@ def release(c): """ Release a new version of 'tailbone-corepos'. """ - shutil.rmtree('tailbone_corepos.egg-info') + if os.path.exists('tailbone_corepos.egg-info'): + shutil.rmtree('tailbone_corepos.egg-info') c.run('python setup.py sdist --formats=gztar') filename = f'tailbone_corepos-{__version__}.tar.gz' c.run('twine upload dist/{}'.format(filename))