From ca6eb6fd910f6cfc6aefa854f7fcb937ef1d084c Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 22:08:26 -0500 Subject: [PATCH 1/5] feat: switch from setup.cfg to pyproject.toml + hatchling --- .gitignore | 3 +++ pyproject.toml | 42 ++++++++++++++++++++++++++++++++++ setup.cfg | 33 -------------------------- setup.py | 26 --------------------- tailbone_mailchimp/_version.py | 5 +++- tasks.py | 18 +++++++-------- 6 files changed, 57 insertions(+), 70 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.gitignore b/.gitignore index 39b230b..91014cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +*~ +*.pyc +dist/ tailbone_mailchimp.egg-info/ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..1f9d38b --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,42 @@ + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + + +[project] +name = "tailbone-mailchimp" +version = "0.1.1" +description = "Tailbone integration for MailChimp" +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", + "Topic :: Office/Business", + "Topic :: Software Development :: Libraries :: Python Modules", +] +dependencies = [ + "rattail", + "rattail-mailchimp", + "Tailbone", +] + + +[project.urls] +Homepage = "https://rattailproject.org" +Repository = "https://kallithea.rattailproject.org/rattail-project/tailbone-mailchimp" +Changelog = "https://kallithea.rattailproject.org/rattail-project/tailbone-mailchimp/files/master/CHANGELOG.md" + + +[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 871f2c7..0000000 --- a/setup.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8; -*- - -[metadata] -name = tailbone-mailchimp -version = attr: tailbone_mailchimp.__version__ -author = Lance Edgar -author_email = lance@edbob.org -url = https://rattailproject.org/ -license = GNU GPL v3 -description = Tailbone integration for MailChimp -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 - Topic :: Office/Business - Topic :: Software Development :: Libraries :: Python Modules - - -[options] -install_requires = - rattail - rattail-mailchimp - Tailbone - -packages = find: -include_package_data = True -zip_safe = False 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_mailchimp/_version.py b/tailbone_mailchimp/_version.py index 4984097..c24c5ef 100644 --- a/tailbone_mailchimp/_version.py +++ b/tailbone_mailchimp/_version.py @@ -1,3 +1,6 @@ # -*- coding: utf-8; -*- -__version__ = '0.1.1' +from importlib.metadata import version + + +__version__ = version('tailbone-mailchimp') diff --git a/tasks.py b/tasks.py index 195091f..7ed0fc2 100644 --- a/tasks.py +++ b/tasks.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2021 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -30,17 +30,15 @@ import shutil from invoke import task -here = os.path.abspath(os.path.dirname(__file__)) -exec(open(os.path.join(here, 'tailbone_mailchimp', '_version.py')).read()) - - @task -def release(ctx): +def release(c): """ Release a new version of 'tailbone-mailchimp'. """ - shutil.rmtree('tailbone_mailchimp.egg-info') - ctx.run('python setup.py sdist --formats=gztar') + if os.path.exists('dist'): + shutil.rmtree('dist') + if os.path.exists('tailbone_mailchimp.egg-info'): + shutil.rmtree('tailbone_mailchimp.egg-info') + c.run('python -m build --sdist') - filename = 'tailbone-mailchimp-{}.tar.gz'.format(__version__) - ctx.run('twine upload dist/{}'.format(filename)) + c.run('twine upload dist/*') From fd94f3e5c625b2721dcf70fdf43a26775c1ba946 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 22:08:40 -0500 Subject: [PATCH 2/5] =?UTF-8?q?bump:=20version=200.1.1=20=E2=86=92=200.2.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 9e73558..14f396f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to tailbone-mailchimp 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.2.0 (2024-06-10) + +### Feat + +- switch from setup.cfg to pyproject.toml + hatchling + ## [0.1.1] - 2023-06-01 ### Changed - Replace `setup.py` contents with `setup.cfg`. diff --git a/pyproject.toml b/pyproject.toml index 1f9d38b..39409ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "tailbone-mailchimp" -version = "0.1.1" +version = "0.2.0" description = "Tailbone integration for MailChimp" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From f871557c9cbedf24392b9a9fa7f673c87e031966 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 14 Jun 2024 17:32:24 -0500 Subject: [PATCH 3/5] fix: fallback to `importlib_metadata` on older python --- tailbone_mailchimp/_version.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tailbone_mailchimp/_version.py b/tailbone_mailchimp/_version.py index c24c5ef..6f3c965 100644 --- a/tailbone_mailchimp/_version.py +++ b/tailbone_mailchimp/_version.py @@ -1,6 +1,9 @@ # -*- coding: utf-8; -*- -from importlib.metadata import version +try: + from importlib.metadata import version +except ImportError: + from importlib_metadata import version __version__ = version('tailbone-mailchimp') From 55fba0ca04712dad2246529157f82f0cbb2f99fe Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 14 Jun 2024 17:32:30 -0500 Subject: [PATCH 4/5] =?UTF-8?q?bump:=20version=200.2.0=20=E2=86=92=200.2.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 14f396f..b83e353 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to tailbone-mailchimp 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.2.1 (2024-06-14) + +### Fix + +- fallback to `importlib_metadata` on older python + ## v0.2.0 (2024-06-10) ### Feat diff --git a/pyproject.toml b/pyproject.toml index 39409ec..e43c87a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "tailbone-mailchimp" -version = "0.2.0" +version = "0.2.1" description = "Tailbone integration for MailChimp" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 3bd418e585409cedd69a61b6fcc94c15a4a7b75c Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 13 Sep 2024 18:10:04 -0500 Subject: [PATCH 5/5] 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..f4314f3 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ + +# tailbone-mailchimp + +Rattail is a retail software framework, released under the GNU General +Public License. + +This package contains software interfaces for the +[MailChimp](https://mailchimp.com/) system. + +Please see the [Rattail Project](https://rattailproject.org/) for more +information. diff --git a/README.rst b/README.rst deleted file mode 100644 index 0165382..0000000 --- a/README.rst +++ /dev/null @@ -1,14 +0,0 @@ - -tailbone-mailchimp -================== - -Rattail is a retail software framework, released under the GNU General -Public License. - -This package contains software interfaces for the `MailChimp`_ system. - -.. _`MailChimp`: https://mailchimp.com/ - -Please see the `Rattail Project`_ for more information. - -.. _`Rattail Project`: https://rattailproject.org/ diff --git a/pyproject.toml b/pyproject.toml index e43c87a..8c1fe4f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "hatchling.build" name = "tailbone-mailchimp" version = "0.2.1" description = "Tailbone integration for MailChimp" -readme = "README.rst" +readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] license = {text = "GNU GPL v3+"} classifiers = [