baldwin 0.0.7__tar.gz → 0.0.8__tar.gz

baldwin-0.0.8/LICENSE.txt

@@ -0,0 +1,18 @@
+The MIT License (MIT)
+
+Copyright (c) 2025 baldwin authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{baldwin-0.0.7 → baldwin-0.0.8}/PKG-INFO

@@ -1,26 +1,33 @@
 Metadata-Version: 2.3
 Name: baldwin
-Version: 0.0.7
+Version: 0.0.8
 Summary: Simple tracking of your home directory with easy-to-read diffs.
 License: MIT
 Keywords: command line,file management,git,version control
 Author: Andrew Udvare
 Author-email: audvare@gmail.com
-Requires-Python: >=3.12,<4
+Requires-Python: >=3.10,<3.14
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
+Provides-Extra: erdantic
 Requires-Dist: binaryornot (>=0.4.4,<0.5.0)
 Requires-Dist: click (>=8.1.8,<9.0.0)
+Requires-Dist: erdantic (<2.0) ; extra == "erdantic"
 Requires-Dist: gitpython (>=3.1.44,<4.0.0)
 Requires-Dist: platformdirs (>=4.3.6,<5.0.0)
+Requires-Dist: tomlkit (>=0.13.2,<0.14.0)
+Requires-Dist: typing-extensions (>=4.13.1,<5.0.0)
 Project-URL: Documentation, https://baldwin.readthedocs.org
+Project-URL: Homepage, https://tatsh.github.io/baldwin/
+Project-URL: Issues, https://github.com/Tatsh/baldwin/issues
 Project-URL: Repository, https://github.com/Tatsh/baldwin
-Project-URL: issues, https://github.com/Tatsh/baldwin/issues
 Description-Content-Type: text/markdown
 
 # Simple home directory versioning
@@ -32,7 +39,7 @@ Description-Content-Type: text/markdown
 ![PyPI - Version](https://img.shields.io/pypi/v/baldwin)
 ![GitHub tag (with filter)](https://img.shields.io/github/v/tag/Tatsh/baldwin)
 ![GitHub](https://img.shields.io/github/license/Tatsh/baldwin)
-![GitHub commits since latest release (by SemVer including pre-releases)](https://img.shields.io/github/commits-since/Tatsh/baldwin/v0.0.7/master)
+![GitHub commits since latest release (by SemVer including pre-releases)](https://img.shields.io/github/commits-since/Tatsh/baldwin/v0.0.8/master)
 
 This is a conversion of my simple scripts to version my home directory with very specific excludes
 and formatting every file upon commit so that readable diffs can be generated.

{baldwin-0.0.7 → baldwin-0.0.8}/README.md

@@ -7,7 +7,7 @@
 ![PyPI - Version](https://img.shields.io/pypi/v/baldwin)
 ![GitHub tag (with filter)](https://img.shields.io/github/v/tag/Tatsh/baldwin)
 ![GitHub](https://img.shields.io/github/license/Tatsh/baldwin)
-![GitHub commits since latest release (by SemVer including pre-releases)](https://img.shields.io/github/commits-since/Tatsh/baldwin/v0.0.7/master)
+![GitHub commits since latest release (by SemVer including pre-releases)](https://img.shields.io/github/commits-since/Tatsh/baldwin/v0.0.8/master)
 
 This is a conversion of my simple scripts to version my home directory with very specific excludes
 and formatting every file upon commit so that readable diffs can be generated.

baldwin-0.0.8/baldwin/__init__.py

@@ -0,0 +1,2 @@
+"""baldwin module."""
+__version__ = '0.0.8'

baldwin-0.0.8/baldwin/__main__.py

@@ -0,0 +1,4 @@
+"""Main entry point for the Baldwin CLI."""
+from .main import baldwin as main
+
+main()

{baldwin-0.0.7 → baldwin-0.0.8}/baldwin/lib.py

@@ -1,13 +1,13 @@
 """Baldwin library."""
 from collections.abc import Iterable
 from dataclasses import dataclass
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from importlib import resources
 from itertools import chain
 from pathlib import Path
 from shlex import quote
 from shutil import which
-from typing import Literal
+from typing import Any, Literal
 import logging
 import os
 import subprocess as sp
@@ -15,6 +15,7 @@ import subprocess as sp
 from binaryornot.check import is_binary
 from git import Actor, Repo
 import platformdirs
+import tomlkit
 
 log = logging.getLogger(__name__)
 
@@ -76,7 +77,7 @@ def auto_commit() -> None:
     if items_to_remove:
         repo.index.remove(items_to_remove)
     if items_to_add or items_to_remove or len(repo.index.diff('HEAD')) > 0:
-        repo.index.commit(f'Automatic commit @ {datetime.now(tz=UTC).isoformat()}',
+        repo.index.commit(f'Automatic commit @ {datetime.now(tz=timezone.utc).isoformat()}',
                           committer=Actor('Auto-commiter', 'hgit@tat.sh'))
 
 
@@ -136,6 +137,14 @@ def get_git_path() -> Path:
     return platformdirs.user_data_path('home-git', roaming=True)
 
 
+def get_config() -> tomlkit.TOMLDocument | dict[str, Any]:
+    """Get the configuration (TOML file)."""
+    config_file = platformdirs.user_config_path('baldwin', roaming=True) / 'config.toml'
+    if not config_file.exists():
+        return {}
+    return tomlkit.loads(config_file.read_text())
+
+
 def get_repo() -> Repo:
     """
     Get a :py:class:`git.Repo` object.
@@ -167,14 +176,15 @@ def format_(filenames: Iterable[Path | str] | None = None,
                        for d in repo.index.diff(None) if d.a_path is not None),
                      *(x for x in (Path.home() / y for y in repo.untracked_files)
                        if x.is_file() and not is_binary(str(x))))
-    if not (filenames := list(filenames)):
+    if not (filenames := list(filenames)) or not (prettier := which('prettier')):
         return
-    with resources.path('baldwin.resources', 'prettier.config.json') as config_file:
-        if not (prettier := which('prettier')):
-            return
+    with resources.path('baldwin.resources', 'prettier.config.json') as default_config_file:
+        config_file = get_config().get('baldwin', {
+            'prettier_config': str(default_config_file)
+        }).get('prettier_config')
         # Detect plugins
-        node_modules_path = (Path(prettier).resolve(strict=True).parent / '..' /
-                             '..').resolve(strict=True)
+        node_modules_path = (Path(prettier).resolve(strict=True).parent /
+                             '../..').resolve(strict=True)
         cmd_prefix = (prettier, '--config', str(config_file), '--write',
                       '--no-error-on-unmatched-pattern', '--ignore-unknown', '--log-level',
                       log_level, *chain(*(('--plugin', str(fp))

{baldwin-0.0.7 → baldwin-0.0.8}/baldwin/main.py

@@ -3,23 +3,23 @@ import logging
 import click
 
 from .lib import (
-    auto_commit,
+    auto_commit as auto_commit_,
     format_,
-    git,
-    init,
-    install_units,
+    git as git_,
+    init as init_,
+    install_units as install_units_,
     repo_info,
     set_git_env_vars,
 )
 
 log = logging.getLogger(__name__)
 
-__all__ = ('baldwin_main', 'git_main')
+__all__ = ('baldwin', 'git')
 
 
 @click.group(context_settings={'help_option_names': ('-h', '--help')})
 @click.option('-d', '--debug', help='Enable debug logging.', is_flag=True)
-def baldwin_main(*, debug: bool = False) -> None:
+def baldwin(*, debug: bool = False) -> None:
     """Manage a home directory with Git."""
     set_git_env_vars()
     logging.basicConfig(level=logging.DEBUG if debug else logging.ERROR)
@@ -30,31 +30,31 @@ def baldwin_main(*, debug: bool = False) -> None:
     'ignore_unknown_options': True
 })
 @click.argument('args', nargs=-1, type=click.UNPROCESSED)
-def git_main(args: tuple[str, ...]) -> None:
+def git(args: tuple[str, ...]) -> None:
     """Wrap git with git-dir and work-tree passed."""
-    git(args)
+    git_(args)
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def init_main() -> None:
+def init() -> None:
     """Start tracking a home directory."""
-    init()
+    init_()
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def auto_commit_main() -> None:
+def auto_commit() -> None:
     """Automated commit of changed and untracked files."""
-    auto_commit()
+    auto_commit_()
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def format_main() -> None:
+def format() -> None:  # noqa: A001
     """Format changed and untracked files."""
     format_()
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def info_main() -> None:
+def info() -> None:
     """Get basic information about the repository."""
     data = repo_info()
     click.echo(f'git-dir path: {data.git_dir_path}')
@@ -62,14 +62,14 @@ def info_main() -> None:
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def install_units_main() -> None:
+def install_units() -> None:
     """Install systemd units for automatic committing."""
-    install_units()
+    install_units_()
 
 
-baldwin_main.add_command(auto_commit_main, 'auto-commit')
-baldwin_main.add_command(format_main, 'format')
-baldwin_main.add_command(git_main, 'git')
-baldwin_main.add_command(info_main, 'info')
-baldwin_main.add_command(init_main, 'init')
-baldwin_main.add_command(install_units_main, 'install-units')
+baldwin.add_command(auto_commit)
+baldwin.add_command(format)
+baldwin.add_command(git)
+baldwin.add_command(info)
+baldwin.add_command(init)
+baldwin.add_command(install_units)

baldwin-0.0.8/man/baldwin.1

@@ -0,0 +1,151 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "BALDWIN" "1" "Apr 12, 2025" "0.0.7" "baldwin"
+.SH NAME
+baldwin \- baldwin v0.0.7
+.sp
+This is a conversion of my simple scripts to version my home directory with very specific excludes
+and formatting every file upon commit so that readable diffs can be generated.
+.SH COMMANDS
+.SS bw
+.sp
+Manage a home directory with Git.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw [OPTIONS] COMMAND [ARGS]...
+.EE
+.UNINDENT
+.UNINDENT
+.sp
+Options
+.INDENT 0.0
+.TP
+.B \-d, \-\-debug
+Enable debug logging.
+.UNINDENT
+.SS auto\-commit
+.sp
+Automated commit of changed and untracked files.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw auto\-commit [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS format
+.sp
+Format changed and untracked files.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw format [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS git
+.sp
+Wrap git with git\-dir and work\-tree passed.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw git [OPTIONS] [ARGS]...
+.EE
+.UNINDENT
+.UNINDENT
+.sp
+Arguments
+.INDENT 0.0
+.TP
+.B ARGS
+Optional argument(s)
+.UNINDENT
+.SS info
+.sp
+Get basic information about the repository.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw info [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS init
+.sp
+Start tracking a home directory.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw init [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS install\-units
+.sp
+Install systemd units for automatic committing.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw install\-units [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS hgit
+.sp
+Wrap git with git\-dir and work\-tree passed.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+hgit [OPTIONS] [ARGS]...
+.EE
+.UNINDENT
+.UNINDENT
+.sp
+Arguments
+.INDENT 0.0
+.TP
+.B ARGS
+Optional argument(s)
+.UNINDENT
+.SH AUTHOR
+Andrew Udvare <audvare@gmail.com>
+.SH COPYRIGHT
+2025
+.\" Generated by docutils manpage writer.
+.

{baldwin-0.0.7 → baldwin-0.0.8}/pyproject.toml

@@ -8,6 +8,8 @@ classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: MIT License",
   "Programming Language :: Python",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Typing :: Typed",
@@ -18,15 +20,23 @@ keywords = ["command line", "file management", "git", "version control"]
 license = "MIT"
 name = "baldwin"
 readme = "README.md"
-version = "0.0.7"
+version = "0.0.8"
 
 [[project.authors]]
 email = "audvare@gmail.com"
 name = "Andrew Udvare"
 
+[project.optional-dependencies]
+erdantic = ["erdantic<2.0"]
+
+[project.scripts]
+bw = "baldwin.main:baldwin"
+hgit = "baldwin.main:git"
+
 [project.urls]
+Issues = "https://github.com/Tatsh/baldwin/issues"
 documentation = "https://baldwin.readthedocs.org"
-issues = "https://github.com/Tatsh/baldwin/issues"
+homepage = "https://tatsh.github.io/baldwin/"
 repository = "https://github.com/Tatsh/baldwin"
 
 [tool]
@@ -34,23 +44,31 @@ repository = "https://github.com/Tatsh/baldwin"
 [tool.commitizen]
 tag_format = "v$version"
 version_files = [
-  ".project.jsonnet",
+  ".wiswa.jsonnet",
   "CITATION.cff",
   "README.md",
-  "baldwin/__init__.py",
   "package.json",
+  "baldwin/__init__.py",
 ]
 version_provider = "pep621"
 
 [tool.coverage]
 
 [tool.coverage.report]
-omit = ["tests/conftest.py", "tests/test_*.py"]
+omit = ["conftest.py", "tests.py", "tests/test_*.py", "__main__.py"]
 show_missing = true
 
 [tool.coverage.run]
 branch = true
-omit = ["tests/conftest.py", "tests/test_*.py"]
+omit = ["conftest.py", "tests.py", "tests/test_*.py", "__main__.py"]
+
+[tool.djlint]
+max_line_length = 100
+no_line_after_yaml = true
+preserve_blank_lines = true
+preserve_leading_space = true
+profile = "jinja"
+use_gitignore = true
 
 [tool.doc8]
 max-line-length = 100
@@ -59,20 +77,23 @@ max-line-length = 100
 cache_dir = "~/.cache/mypy"
 explicit_package_bases = true
 platform = "linux"
-python_version = "3.12"
+python_version = "3.10"
 show_column_numbers = true
 strict = true
 strict_optional = true
 warn_unreachable = true
 
 [tool.poetry]
+include = ["man"]
 
 [tool.poetry.dependencies]
 binaryornot = "^0.4.4"
 click = "^8.1.8"
 gitpython = "^3.1.44"
 platformdirs = "^4.3.6"
-python = ">=3.12,<4"
+python = ">=3.10,<3.14"
+tomlkit = "^0.13.2"
+typing-extensions = "^4.13.1"
 
 [tool.poetry.group]
 
@@ -81,46 +102,54 @@ optional = true
 
 [tool.poetry.group.dev.dependencies]
 binaryornot-stubs = "^0"
-commitizen = "^4.0.0"
-mypy = "^1.13.0"
-ruff = "^0.8.0"
+commitizen = "^4.5.0"
+djlint = "^1.36.4"
+mypy = ">=1.12,<1.16"
+ruff = "^0.11.2"
 yapf = "^0.43.0"
 
 [tool.poetry.group.docs]
 optional = true
 
 [tool.poetry.group.docs.dependencies]
+autodoc-pydantic = "^2.2.0"
 doc8 = "^1.1.2"
 docutils = "^0.21.2"
 esbonio = "^0.16.5"
+numpydoc = "^1.8.0"
 restructuredtext-lint = "^1.4.0"
-sphinx = "^8.1.3"
+sphinx = "<8.2.0"
 sphinx-click = "^6.0.0"
-tomlkit = "^0.13.2"
+sphinx-datatables = "^0.2.1"
+sphinx-hoverxref = "^1.4.2"
+sphinx-immaterial = "^0.13.4"
+
+[tool.poetry.group.docs.dependencies.enum-tools]
+extras = ["sphinx"]
+version = "^0.12.0"
 
 [tool.poetry.group.tests]
 optional = true
 
 [tool.poetry.group.tests.dependencies]
-coveralls = "^3.3.1"
-mock = "^5.1.0"
-pytest = "^8.3.3"
-pytest-cov = "^5.0.0"
+mock = "^5.2.0"
+pytest = "^8.3.5"
+pytest-cov = "^6.1.1"
 pytest-mock = "^3.14.0"
 
+[tool.poetry.group.tests.dependencies.coveralls]
+python = "<3.13"
+version = "^4.0.1"
+
 [[tool.poetry.packages]]
 include = "baldwin"
 
-[tool.poetry.scripts]
-bw = "baldwin.main:baldwin_main"
-hgit = "baldwin.main:git_main"
-
 [tool.pyright]
 deprecateTypingAliases = true
 enableExperimentalFeatures = true
 include = ["./baldwin", "./tests"]
 pythonPlatform = "Linux"
-pythonVersion = "3.12"
+pythonVersion = "3.10"
 reportCallInDefaultInitializer = "warning"
 reportImplicitOverride = "warning"
 reportImportCycles = "error"
@@ -136,16 +165,15 @@ useLibraryCodeForTypes = false
 [tool.pytest.ini_options]
 mock_use_standalone_module = true
 norecursedirs = ["node_modules"]
-python_files = ["test_*.py", "*_tests.py"]
+python_files = ["tests.py", "test_*.py", "*_tests.py"]
 testpaths = ["tests"]
 
 [tool.ruff]
 cache-dir = "~/.cache/ruff"
-extend-exclude = []
 force-exclude = true
 line-length = 100
 namespace-packages = ["docs", "tests"]
-target-version = "py312"
+target-version = "py310"
 unsafe-fixes = true
 
 [tool.ruff.lint]
@@ -243,6 +271,8 @@ ignore = [
   "TD002",
   "TD003",
   "TD004",
+  "UP046",
+  "UP047",
 ]
 preview = true
 

baldwin-0.0.7/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2023 baldwin authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

baldwin-0.0.7/baldwin/__init__.py

@@ -1,2 +0,0 @@
-"""Manage a home directory with Git."""
-__version__ = '0.0.7'