From 8a1ec6210c3d592fc80a7e87b8270f3b319bf300 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 10 Jun 2024 13:29:22 -0500 Subject: [PATCH] feat: replace setup.cfg with pyproject.toml also move canonical version to pyproject.toml still using setuptools as build backend for now --- .gitignore | 3 ++ pyproject.toml | 69 ++++++++++++++++++++++++++++++++++++ setup.cfg | 56 ----------------------------- setup.py | 29 --------------- src/wuttjamaican/_version.py | 5 ++- 5 files changed, 76 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 0018c16..f234ebc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ +*~ +*.pyc .coverage +dist/ docs/_build/ .tox/ WuttJamaican.egg-info/ diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..830f24a --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,69 @@ + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + + +[project] +name = "WuttJamaican" +version = "0.1.12" +description = "Base package for Wutta Framework" +readme = "README.rst" +authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] +license = {file = "COPYING.txt"} +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", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", +] +requires-python = ">= 3.6" +dependencies = [ + "python-configuration", +] + + +[project.optional-dependencies] +db = ["SQLAlchemy<2"] +docs = ["Sphinx", "sphinxcontrib-programoutput"] +tests = ["pytest-cov", "tox"] + + +[project.scripts] +wutta = "wuttjamaican.cmd.base:main" + + +[project.entry-points."wutta.subcommands"] +date-organize = "wuttjamaican.cmd.date_organize:DateOrganize" +make-appdir = "wuttjamaican.cmd.make_appdir:MakeAppDir" +setup = "wuttjamaican.cmd.setup:Setup" + + +[project.urls] +Homepage = "https://rattailproject.org/" +Repository = "https://kallithea.rattailproject.org/rattail-project/wuttjamaican" +Changelog = "https://kallithea.rattailproject.org/rattail-project/wuttjamaican/files/master/CHANGELOG.md" + + +[tool.commitizen] +version_provider = "pep621" +tag_format = "v$version" +update_changelog_on_bump = true + + +[tool.setuptools] +include-package-data = true +package-dir = {"" = "src"} + + +[tool.setuptools.packages.find] +where = ["src"] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 6a8ac71..0000000 --- a/setup.cfg +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8; -*- - -[metadata] -name = WuttJamaican -version = attr: wuttjamaican.__version__ -author = Lance Edgar -author_email = lance@edbob.org -url = https://rattailproject.org/ -license = GNU GPL v3 -description = Base package for Wutta Framework -long_description = file: README.rst -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 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - - -[options] -packages = find: -package_dir = - =src -include_package_data = True -python_requires = >=3.6 -install_requires = - python-configuration - - -[options.packages.find] -where = src - - -[options.extras_require] -db = SQLAlchemy<2 -docs = Sphinx; sphinxcontrib-programoutput -tests = pytest-cov; tox - - -[options.entry_points] - -console_scripts = - wutta = wuttjamaican.cmd.base:main - -wutta.subcommands = - date-organize = wuttjamaican.cmd.date_organize:DateOrganize - make-appdir = wuttjamaican.cmd.make_appdir:MakeAppDir - setup = wuttjamaican.cmd.setup:Setup diff --git a/setup.py b/setup.py deleted file mode 100644 index aa529c4..0000000 --- a/setup.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8; -*- -################################################################################ -# -# WuttJamaican -- Base package for Wutta Framework -# Copyright © 2023 Lance Edgar -# -# This file is part of Wutta Framework. -# -# Wutta Framework 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. -# -# Wutta Framework 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 -# Wutta Framework. If not, see . -# -################################################################################ -""" -WuttJamaican setup script -""" - -from setuptools import setup - -setup() diff --git a/src/wuttjamaican/_version.py b/src/wuttjamaican/_version.py index 002a140..9cd05c1 100644 --- a/src/wuttjamaican/_version.py +++ b/src/wuttjamaican/_version.py @@ -1,3 +1,6 @@ # -*- coding: utf-8; -*- -__version__ = '0.1.12' +from importlib.metadata import version + + +__version__ = version('WuttJamaican')