From 2e5da95ec7420496daa913d449690a729df8c1d9 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Wed, 15 Jul 2026 15:55:58 +0300 Subject: [PATCH] reformat tomls --- ahriman-core/pyproject.toml | 16 +++-- ahriman-triggers/pyproject.toml | 20 ++++-- ahriman-web/pyproject.toml | 20 ++++-- pyproject.toml | 43 ++++++------ tox.toml | 114 +++++++++++++++++++++----------- 5 files changed, 135 insertions(+), 78 deletions(-) diff --git a/ahriman-core/pyproject.toml b/ahriman-core/pyproject.toml index 82798a4e..84b2d937 100644 --- a/ahriman-core/pyproject.toml +++ b/ahriman-core/pyproject.toml @@ -1,5 +1,7 @@ [build-system] -requires = ["hatchling"] +requires = [ + "hatchling", +] build-backend = "hatchling.build" [project] @@ -7,9 +9,9 @@ name = "ahriman-core" description = "ArcH linux ReposItory MANager, core package" readme = "../README.md" requires-python = ">=3.13" -license = {file = "../COPYING"} +license = { file = "../COPYING" } authors = [ - {name = "ahriman team"}, + { name = "ahriman team" }, ] dependencies = [ "bcrypt", @@ -18,7 +20,9 @@ dependencies = [ "pyelftools", "requests", ] -dynamic = ["version"] +dynamic = [ + "version", +] [project.optional-dependencies] journald = [ @@ -61,7 +65,9 @@ Changelog = "https://github.com/arcan1s/ahriman/releases" path = "src/ahriman/__init__.py" [tool.hatch.build.targets.wheel] -packages = ["src/ahriman"] +packages = [ + "src/ahriman", +] [tool.hatch.build.targets.wheel.shared-data] "package/lib" = "lib" diff --git a/ahriman-triggers/pyproject.toml b/ahriman-triggers/pyproject.toml index 4346db16..44aa09a9 100644 --- a/ahriman-triggers/pyproject.toml +++ b/ahriman-triggers/pyproject.toml @@ -1,5 +1,7 @@ [build-system] -requires = ["hatchling"] +requires = [ + "hatchling", +] build-backend = "hatchling.build" [project] @@ -7,14 +9,16 @@ name = "ahriman-triggers" description = "ArcH linux ReposItory MANager, additional extensions" readme = "../README.md" requires-python = ">=3.13" -license = {file = "../COPYING"} +license = { file = "../COPYING" } authors = [ - {name = "ahriman team"}, + { name = "ahriman team" }, ] dependencies = [ "ahriman-core", ] -dynamic = ["version"] +dynamic = [ + "version", +] [project.urls] Documentation = "https://ahriman.readthedocs.io/" @@ -25,8 +29,12 @@ Changelog = "https://github.com/arcan1s/ahriman/releases" path = "../ahriman-core/src/ahriman/__init__.py" [tool.hatch.build.targets.wheel] -only-include = ["src/ahriman"] -sources = ["src"] +only-include = [ + "src/ahriman", +] +sources = [ + "src", +] [tool.hatch.build.targets.wheel.shared-data] "package/share" = "share" diff --git a/ahriman-web/pyproject.toml b/ahriman-web/pyproject.toml index 4be8c799..63c794e0 100644 --- a/ahriman-web/pyproject.toml +++ b/ahriman-web/pyproject.toml @@ -1,5 +1,7 @@ [build-system] -requires = ["hatchling"] +requires = [ + "hatchling", +] build-backend = "hatchling.build" [project] @@ -7,9 +9,9 @@ name = "ahriman-web" description = "ArcH linux ReposItory MANager, web server" readme = "../README.md" requires-python = ">=3.13" -license = {file = "../COPYING"} +license = { file = "../COPYING" } authors = [ - {name = "ahriman team"}, + { name = "ahriman team" }, ] dependencies = [ "ahriman-core", @@ -18,7 +20,9 @@ dependencies = [ "aiohttp_jinja2", "aiohttp_sse", ] -dynamic = ["version"] +dynamic = [ + "version", +] [project.optional-dependencies] auth = [ @@ -47,8 +51,12 @@ Changelog = "https://github.com/arcan1s/ahriman/releases" path = "../ahriman-core/src/ahriman/__init__.py" [tool.hatch.build.targets.wheel] -only-include = ["src/ahriman"] -sources = ["src"] +only-include = [ + "src/ahriman", +] +sources = [ + "src", +] [tool.hatch.build.targets.wheel.shared-data] "package/lib" = "lib" diff --git a/pyproject.toml b/pyproject.toml index 63e68bae..8fa0ba54 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,27 +1,26 @@ [build-system] -requires = ["hatchling"] +requires = [ + "hatchling", +] build-backend = "hatchling.build" [project] name = "ahriman" - description = "ArcH linux ReposItory MANager" readme = "README.md" - requires-python = ">=3.13" - -license = {file = "COPYING"} +license = { file = "COPYING" } authors = [ - {name = "ahriman team"}, + { name = "ahriman team" }, ] - dependencies = [ "ahriman-core", "ahriman-triggers", "ahriman-web", ] - -dynamic = ["version"] +dynamic = [ + "version", +] [project.urls] Documentation = "https://ahriman.readthedocs.io/" @@ -36,13 +35,13 @@ check = [ "pylint", ] docs = [ - "ahriman-core[s3,validator]", - "Sphinx", - "argparse-manpage", - "pydeps", - "shtab", - "sphinx-argparse", - "sphinx-rtd-theme>=1.1.1", # https://stackoverflow.com/a/74355734 + "ahriman-core[s3,validator]", + "Sphinx", + "argparse-manpage", + "pydeps", + "shtab", + "sphinx-argparse", + "sphinx-rtd-theme>=1.1.1", # https://stackoverflow.com/a/74355734 ] tests = [ "pytest", @@ -75,18 +74,18 @@ bypass-selection = true [tool.hatch.envs.default] workspace.members = [ - {path = "ahriman-core"}, - {path = "ahriman-triggers"}, - {path = "ahriman-web"}, + { path = "ahriman-core" }, + { path = "ahriman-triggers" }, + { path = "ahriman-web" }, ] [tool.hatch.version] path = "ahriman-core/src/ahriman/__init__.py" [tool.uv.sources] -ahriman-core = {workspace = true} -ahriman-triggers = {workspace = true} -ahriman-web = {workspace = true} +ahriman-core = { workspace = true } +ahriman-triggers = { workspace = true } +ahriman-web = { workspace = true } [tool.uv.workspace] members = [ diff --git a/tox.toml b/tox.toml index 96f0f8d0..21071dc8 100644 --- a/tox.toml +++ b/tox.toml @@ -15,26 +15,36 @@ npm_install = [ "npm", { replace = "ref", of = ["flags", "npm"], extend = true }, "install", - "--cache", "{envtmpdir}/npm-cache", + "--cache", + "{envtmpdir}/npm-cache", ], ] [flags] autopep8 = [ - "--max-line-length", "120", + "--max-line-length", + "120", "-aa", ] bandit = [ - "--configfile", ".bandit.yml", + "--configfile", + ".bandit.yml", ] manpage = [ - "--author", "{[project]name} team", - "--author-email", "", - "--description", "ArcH linux ReposItory MANager", - "--manual-title", "ArcH linux ReposItory MANager", - "--project-name", "{[project]name}", - "--version", "{env:VERSION}", - "--url", "https://github.com/arcan1s/ahriman", + "--author", + "{[project]name} team", + "--author-email", + "", + "--description", + "ArcH linux ReposItory MANager", + "--manual-title", + "ArcH linux ReposItory MANager", + "--project-name", + "{[project]name}", + "--version", + "{env:VERSION}", + "--url", + "https://github.com/arcan1s/ahriman", ] mypy = [ "--implicit-reexport", @@ -43,18 +53,22 @@ mypy = [ "--allow-subclassing-any", ] npm = [ - "--prefix", "frontend", + "--prefix", + "frontend", ] pydeps = [ "--no-config", "--cluster", ] pylint = [ - "--rcfile", ".pylint.toml", + "--rcfile", + ".pylint.toml", ] shtab = [ - "--prefix", "{[project]name}", - "--prog", "{[project]name}", + "--prefix", + "{[project]name}", + "--prog", + "{[project]name}", "ahriman.application.ahriman._parser", ] @@ -73,7 +87,8 @@ system_site_packages = true commands = [ [ "{envpython}", - "-m", "build", + "-m", + "build", "--sdist", "--no-isolation", ], @@ -99,7 +114,8 @@ commands = [ { replace = "ref", of = ["flags", "autopep8"], extend = true }, "--exit-code", "--in-place", - "--jobs", "0", + "--jobs", + "0", "--recursive", "ahriman-core/src/{[project]name}", "ahriman-triggers/src/{[project]name}", @@ -125,18 +141,20 @@ commands = [ [ "bandit", { replace = "ref", of = ["flags", "bandit"], extend = true }, - "--skip", "B101,B105,B106", + "--skip", + "B101,B105,B106", "--recursive", - "ahriman-core/src/{[project]name}", - "ahriman-triggers/src/{[project]name}", - "ahriman-web/src/{[project]name}", + "ahriman-core/tests/{[project]name}", + "ahriman-triggers/tests/{[project]name}", + "ahriman-web/tests/{[project]name}", ], [ "mypy", { replace = "ref", of = ["flags", "mypy"], extend = true }, "--install-types", "--non-interactive", - "--package", "{[project]name}", + "--package", + "{[project]name}", ], { replace = "ref", of = ["commands", "npm_install"], extend = true }, [ @@ -166,26 +184,34 @@ commands = [ [ "shtab", { replace = "ref", of = ["flags", "shtab"], extend = true }, - "--shell", "bash", - "--output", "ahriman-core/package/share/bash-completion/completions/_ahriman", + "--shell", + "bash", + "--output", + "ahriman-core/package/share/bash-completion/completions/_ahriman", ], [ "shtab", { replace = "ref", of = ["flags", "shtab"], extend = true }, - "--shell", "zsh", - "--output", "ahriman-core/package/share/zsh/site-functions/_ahriman", + "--shell", + "zsh", + "--output", + "ahriman-core/package/share/zsh/site-functions/_ahriman", ], [ "argparse-manpage", { replace = "ref", of = ["flags", "manpage"], extend = true }, - "--module", "ahriman.application.ahriman", - "--function", "_parser", - "--output", "ahriman-core/package/share/man/man1/ahriman.1", + "--module", + "ahriman.application.ahriman", + "--function", + "_parser", + "--output", + "ahriman-core/package/share/man/man1/ahriman.1", ], [ "pydeps", { replace = "ref", of = ["flags", "pydeps"], extend = true }, - "--dot-output", "{tox_root}/docs/_static/architecture.dot", + "--dot-output", + "{tox_root}/docs/_static/architecture.dot", "--no-output", "--show-dot", "{envsitepackagesdir}/{[project]name}", @@ -194,7 +220,8 @@ commands = [ "sphinx-apidoc", "--force", "--no-toc", - "--output-dir", "docs", + "--output-dir", + "docs", "{envsitepackagesdir}/{[project]name}", ], # compile list of dependencies for rtd.io @@ -202,11 +229,16 @@ commands = [ "uv", "pip", "compile", - "--group", "pyproject.toml:docs", - "--no-emit-package", "ahriman-core", - "--no-emit-package", "ahriman-triggers", - "--no-emit-package", "ahriman-web", - "--output-file", "docs/requirements.txt", + "--group", + "pyproject.toml:docs", + "--no-emit-package", + "ahriman-core", + "--no-emit-package", + "ahriman-triggers", + "--no-emit-package", + "ahriman-web", + "--output-file", + "docs/requirements.txt", "--quiet", "pyproject.toml", ], @@ -240,9 +272,11 @@ recreate = true commands = [ [ "sphinx-build", - "--builder", "html", + "--builder", + "html", "--fail-on-warning", - "--jobs", "1", + "--jobs", + "1", "--write-all", "docs", "{envtmpdir}/html", @@ -275,7 +309,8 @@ commands = [ [ "git", "commit", - "--message", "Release {posargs}", + "--message", + "Release {posargs}", ], [ "git", @@ -328,7 +363,8 @@ commands = [ # check if version is set and validate it [ "{envpython}", - "-c", "from packaging.version import Version; Version('{posargs}')", + "-c", + "from packaging.version import Version; Version('{posargs}')", ], [ "sed",