d50891dfe5
This commit introduces a large-scale structural refactor of the pkgmgr
codebase. All functionality has been moved from the previous flat
top-level layout into three clearly separated namespaces:
• pkgmgr.actions – high-level operations invoked by the CLI
• pkgmgr.core – pure logic, helpers, repository utilities,
versioning, git helpers, config IO, and
command resolution
• pkgmgr.cli – parser, dispatch, context, and command
handlers
Key improvements:
- Moved all “branch”, “release”, “changelog”, repo-management
actions, installer pipelines, and proxy execution logic into
pkgmgr.actions.<domain>.
- Reworked installer structure under
pkgmgr.actions.repository.install.installers
including OS-package installers, Nix, Python, and Makefile.
- Consolidated all low-level functionality under pkgmgr.core:
• git helpers → core/git
• config load/save → core/config
• repository helpers → core/repository
• versioning & semver → core/version
• command helpers (alias, resolve, run, ink) → core/command
- Replaced pkgmgr.cli_core with pkgmgr.cli and updated all imports.
- Added minimal __init__.py files for clean package exposure.
- Updated all E2E, integration, and unit tests with new module paths.
- Fixed patch targets so mocks point to the new structure.
- Ensured backward compatibility at the CLI boundary (pkgmgr entry point unchanged).
This refactor produces a cleaner, layered architecture:
- `core` = logic
- `actions` = orchestrated behaviour
- `cli` = user interface
Reference: ChatGPT-assisted refactor discussion
https://chatgpt.com/share/6938221c-e24c-800f-8317-7732cedf39b9
69 lines
1.9 KiB
Python
69 lines
1.9 KiB
Python
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
|
|
"""
|
|
Installer for Python projects based on pyproject.toml.
|
|
|
|
Strategy:
|
|
- Determine a pip command in this order:
|
|
1. $PKGMGR_PIP (explicit override, e.g. ~/.venvs/pkgmgr/bin/pip)
|
|
2. sys.executable -m pip (current interpreter)
|
|
3. "pip" from PATH as last resort
|
|
- If pyproject.toml exists: pip install .
|
|
|
|
All installation failures are treated as fatal errors (SystemExit).
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
|
|
from pkgmgr.actions.repository.install.installers.base import BaseInstaller
|
|
from pkgmgr.core.command.run import run_command
|
|
|
|
|
|
class PythonInstaller(BaseInstaller):
|
|
"""Install Python projects and dependencies via pip."""
|
|
|
|
# Logical layer name, used by capability matchers.
|
|
layer = "python"
|
|
|
|
def supports(self, ctx) -> bool:
|
|
"""
|
|
Return True if this installer should handle the given repository.
|
|
|
|
Only pyproject.toml is supported as the single source of truth
|
|
for Python dependencies and packaging metadata.
|
|
"""
|
|
repo_dir = ctx.repo_dir
|
|
return os.path.exists(os.path.join(repo_dir, "pyproject.toml"))
|
|
|
|
def _pip_cmd(self) -> str:
|
|
"""
|
|
Resolve the pip command to use.
|
|
"""
|
|
explicit = os.environ.get("PKGMGR_PIP", "").strip()
|
|
if explicit:
|
|
return explicit
|
|
|
|
if sys.executable:
|
|
return f"{sys.executable} -m pip"
|
|
|
|
return "pip"
|
|
|
|
def run(self, ctx) -> None:
|
|
"""
|
|
Install Python project defined via pyproject.toml.
|
|
|
|
Any pip failure is propagated as SystemExit.
|
|
"""
|
|
pip_cmd = self._pip_cmd()
|
|
|
|
pyproject = os.path.join(ctx.repo_dir, "pyproject.toml")
|
|
if os.path.exists(pyproject):
|
|
print(
|
|
f"pyproject.toml found in {ctx.identifier}, "
|
|
f"installing Python project..."
|
|
)
|
|
cmd = f"{pip_cmd} install ."
|
|
run_command(cmd, cwd=ctx.repo_dir, preview=ctx.preview)
|