From 7b4f96477e60d057c227b3b104810cf3d8f5d691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20M=2E=20Navarro?= Date: Sat, 20 Jan 2024 13:23:15 +0100 Subject: [PATCH] Build system refactored and moved to hatchling. --- CHANGELOG.md | 4 ++++ TODO.md | 1 + src/multigit/__init__.py | 8 ++++---- src/pyproject.toml | 20 -------------------- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e87d07..f0e0ec2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # CHANGELOG ## Next Release +* All build config move to [pyproject.toml](./src/pyproject.toml) +* Build system moved from setuptools to hatchling. +* Dependencies fully relaxed (no versions defined). +* Preliminary support for a demonstration/development docker container. ## 0.11.5 (2023-OCT-21) * Differences from [previous tag](/../../compare/v0.11.4-2…v0.11.5). diff --git a/TODO.md b/TODO.md index 4e936b8..6526219 100644 --- a/TODO.md +++ b/TODO.md @@ -4,5 +4,6 @@ Pending actions, general notes, etc. (in no particular order): * Find the way to self-document the python dictionary that represents subrepos for easier reuse. * Find the way for Sphinx to offer a drop-down to select git tag-tied versions of documentation. * https://www.codingwiththomas.com/blog/my-sphinx-best-practice-for-a-multiversion-documentation-in-different-languages +* Refactor code so Makefile, pyproject.toml are at the repository's root? ## IN PROGRESS diff --git a/src/multigit/__init__.py b/src/multigit/__init__.py index 4241293..b0be778 100644 --- a/src/multigit/__init__.py +++ b/src/multigit/__init__.py @@ -8,7 +8,7 @@ :source: https://github.com/jmnavarrol/python-multigit """ -__version__ = '0.11.5' +__version__ = '0.11.5.post2' # Import stuff import os, sys @@ -29,18 +29,18 @@ def main(): description="Manages git repos within git repos.", add_help=False, # this way I can force help to be an exclusion option along the others ) - + # Main options main_parser = parser.add_mutually_exclusive_group() main_parser.add_argument('-h', '--help', action='store_true', help="Shows this help.") main_parser.add_argument('-V', '--version', action='store_true', help="Shows " + parser.prog + " version and quits.") main_parser.add_argument('-r', '--run', action='store_true', help="Recursively processes '" + SUBREPOS_FILE + "' files found.") main_parser.add_argument('-s', '--status', action='store_true', help="Shows repositories' current status.") - + # Ready to parse args args = parser.parse_args() #print(args) - + # Run on the options if len(sys.argv) > 1: if args.help: diff --git a/src/pyproject.toml b/src/pyproject.toml index aa7a0fa..02f4d5c 100644 --- a/src/pyproject.toml +++ b/src/pyproject.toml @@ -57,23 +57,3 @@ build-backend = "hatchling.build" [tool.hatch.version] path = "multigit/__init__.py" - - -# [build-system] -# requires = [ -# "setuptools>=65.5", -# "wheel>=0.37" -# ] -# build-backend = "setuptools.build_meta" - -# Other configurations from setup.cfg I still couldn't migrate -# -# # See https://packaging.python.org/tutorials/packaging-projects/ -# [metadata] -# version = attr: multigit.__version__ -# long_description = file: README.md -# long_description_content_type = text/markdown -# -# [options] -# packages = find: -# include_package_data = true