instant-python 0.26.0__py3-none-any.whl → 0.27.0__py3-none-any.whl

instant_python/__init__.py

@@ -1 +1 @@
-__version__ = "0.26.0"
+__version__ = "0.27.0"

instant_python/cli/cli.py

@@ -1,44 +1,39 @@
-from typing import Annotated
+import warnings
 
 import typer
 from rich.console import Console
 from rich.panel import Panel
 
-from instant_python import __version__
 from instant_python.cli.instant_python_typer import InstantPythonTyper
 from instant_python.config.delivery import cli as config
 from instant_python.initialize.delivery import cli as init
 from instant_python.metrics.delivery.metrics_middleware import MetricsMiddleware
 from instant_python.shared.application_error import ApplicationError
+from instant_python.version.delivery import cli as version
 
 app = InstantPythonTyper(cls=MetricsMiddleware)
 console = Console()
 
 
-def version_callback(value: bool) -> None:
-    if value:
-        console.print(f"instant-python {__version__}")
-        raise typer.Exit()
+def _show_warning(message: Warning | str, *_args: object, **_kwargs: object) -> None:
+    warning_panel = Panel(str(message), title="Warning", border_style="yellow")
+    console.print(warning_panel)
+
+
+warnings.showwarning = _show_warning
+warnings.simplefilter("always", DeprecationWarning)
 
 
 @app.callback(invoke_without_command=True)
 def main(
     ctx: typer.Context,
-    version: Annotated[
-        bool | None,
-        typer.Option(
-            "--version",
-            "-V",
-            help="Show the application version",
-            callback=version_callback,
-            is_eager=True,
-        ),
-    ] = None,
 ) -> None:
     if ctx.invoked_subcommand is None:
         console.print(ctx.get_help())
 
 
+app.add_typer(version.app)
+
 app.add_typer(init.app)
 app.add_typer(config.app)
 

instant_python/config/infra/question_wizard/step/general_step.py

@@ -24,7 +24,6 @@ class GeneralStep(Step):
         self._ask_author_name()
         self._ask_license()
         self._ask_python_version()
-        self._ask_dependency_manager()
 
         return {self._KEY: self._answers}
 

instant_python/initialize/delivery/cli.py

@@ -3,14 +3,14 @@ from pathlib import Path
 import typer
 
 from instant_python.initialize.application.project_initializer import ProjectInitializer
-from instant_python.initialize.infra.env_manager.env_manager_factory import EnvManagerFactory
-from instant_python.initialize.infra.env_manager.system_console import SystemConsole
+from instant_python.initialize.infra.env_manager.uv_env_manager import UvEnvManager
 from instant_python.initialize.infra.formatter.ruff_project_formatter import RuffProjectFormatter
 from instant_python.initialize.infra.renderer.jinja_environment import JinjaEnvironment
 from instant_python.initialize.infra.renderer.jinja_project_renderer import JinjaProjectRenderer
 from instant_python.initialize.infra.version_control.git_configurer import GitConfigurer
 from instant_python.initialize.infra.writer.file_system_project_writer import FileSystemProjectWriter
 from instant_python.shared.infra.persistence.yaml_config_repository import YamlConfigRepository
+from instant_python.shared.infra.system_console import SystemConsole
 
 app = typer.Typer()
 
@@ -32,7 +32,7 @@ def create_new_project(
     project_initializer = ProjectInitializer(
         renderer=JinjaProjectRenderer(env=JinjaEnvironment(user_template_path=custom_templates_path)),
         writer=FileSystemProjectWriter(),
-        env_manager=EnvManagerFactory.create(dependency_manager=config.dependency_manager, console=console),
+        env_manager=UvEnvManager(console=console),
         version_control_configurer=GitConfigurer(console=console),
         formatter=RuffProjectFormatter(console=console),
     )

instant_python/initialize/infra/env_manager/env_manager_factory.py

@@ -1,8 +1,7 @@
 from instant_python.initialize.domain.env_manager import EnvManager
-from instant_python.initialize.infra.env_manager.pdm_env_manager import PdmEnvManager
-from instant_python.initialize.infra.env_manager.system_console import SystemConsole
 from instant_python.initialize.infra.env_manager.uv_env_manager import UvEnvManager
 from instant_python.shared.application_error import ApplicationError
+from instant_python.shared.infra.system_console import SystemConsole
 from instant_python.shared.supported_managers import SupportedManagers
 
 
@@ -11,7 +10,6 @@ class EnvManagerFactory:
     def create(dependency_manager: str, console: SystemConsole) -> EnvManager:
         managers = {
             SupportedManagers.UV: UvEnvManager,
-            SupportedManagers.PDM: PdmEnvManager,
         }
         try:
             return managers[SupportedManagers(dependency_manager)](console=console)

instant_python/initialize/infra/env_manager/uv_env_manager.py

@@ -2,12 +2,12 @@ import sys
 from pathlib import Path
 
 from instant_python.initialize.domain.env_manager import EnvManager
-from instant_python.initialize.infra.env_manager.system_console import SystemConsole
 from instant_python.shared.domain.dependency_config import DependencyConfig
+from instant_python.shared.infra.system_console import SystemConsole
 
 
 class UvEnvManager(EnvManager):
-    def __init__(self, console: SystemConsole | None = None) -> None:
+    def __init__(self, console: SystemConsole) -> None:
         self._console = console
         self._system_os = sys.platform
         self._uv = self._set_uv_executable_based_on_os()

instant_python/initialize/infra/formatter/ruff_project_formatter.py

@@ -1,5 +1,5 @@
 from instant_python.initialize.domain.project_formatter import ProjectFormatter
-from instant_python.initialize.infra.env_manager.system_console import SystemConsole
+from instant_python.shared.infra.system_console import SystemConsole
 
 
 class RuffProjectFormatter(ProjectFormatter):

instant_python/initialize/infra/version_control/git_configurer.py

@@ -1,6 +1,6 @@
 from instant_python.initialize.domain.version_control_configurer import VersionControlConfigurer
-from instant_python.initialize.infra.env_manager.system_console import SystemConsole
 from instant_python.shared.domain.git_config import GitConfig
+from instant_python.shared.infra.system_console import SystemConsole
 
 
 class GitConfigurer(VersionControlConfigurer):

instant_python/shared/domain/general_config.py

@@ -1,5 +1,6 @@
 import re
-from dataclasses import asdict, dataclass
+import warnings
+from dataclasses import asdict, dataclass, field
 
 from instant_python.shared.application_error import ApplicationError
 from instant_python.shared.supported_licenses import SupportedLicenses
@@ -16,7 +17,7 @@ class GeneralConfig:
     author: str
     license: str
     python_version: str
-    dependency_manager: str
+    dependency_manager: str = field(default=SupportedManagers.UV.value)
 
     def __post_init__(self) -> None:
         self.version = str(self.version)
@@ -44,6 +45,14 @@ class GeneralConfig:
 
     def _ensure_dependency_manager_is_supported(self) -> None:
         supported_dependency_managers = SupportedManagers.get_supported_managers()
+        if self.dependency_manager == "pdm":
+            warnings.warn(
+                "`pdm` is no longer supported as a dependency manager and has been replaced with `uv`. "
+                "Update your ipy.yml file to remove this warning.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            self.dependency_manager = SupportedManagers.UV.value
         if self.dependency_manager not in supported_dependency_managers:
             raise InvalidDependencyManagerValue(self.dependency_manager, supported_dependency_managers)
 

instant_python/shared/supported_managers.py

@@ -3,7 +3,6 @@ from enum import Enum
 
 class SupportedManagers(str, Enum):
     UV = "uv"
-    PDM = "pdm"
 
     @classmethod
     def get_supported_managers(cls) -> list[str]:

instant_python/templates/boilerplate/.pre-commit-config.yaml

@@ -58,14 +58,14 @@ repos:
     hooks:
       - id: lint
         name: 🧹 Code Linter
-        entry: make check-lint
+        entry: make lint
         language: system
         stages:
           - pre-push
 
       - id: format
         name: 🎨 Code Formatter
-        entry: make check-format
+        entry: make format
         language: system
         stages:
           - pre-push

instant_python/templates/boilerplate/github/action.yml

@@ -20,16 +20,8 @@ runs:
 
     - name: 📦 Install dependencies
       run: |
-        {% if general.dependency_manager == "uv" %}
         uv sync --all-groups
-        {% elif general.dependency_manager == "pdm" %}
-        pdm install
-        {% endif %}
         {% if "precommit_hook" in template.built_in_features %}
-        {% if general.dependency_manager == "uv" %}
         uv run -m pre_commit install
-        {% elif general.dependency_manager == "pdm" %}
-        pdm run pre-commit install
-        {% endif %}
         {% endif %}
       shell: bash

instant_python/templates/boilerplate/github/ci.yml

@@ -31,30 +31,10 @@ jobs:
         uses: ./.github/actions/python_setup
 
       - name: 🧐 Check linting
-        run: make check-lint
-
-  format:
-    name: format
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🛡️ Harden runner
-        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
-        with:
-          egress-policy: audit
-
-      - name: 📥 Checkout the repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
-        with:
-          ref: {% raw %}${{ github.head_ref }}{% endraw %}
-
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: 🛠️ Setup environment
-        uses: ./.github/actions/python_setup
+        run: make lint
 
       - name: 🧐 Check code format
-        run: make check-format
+        run: make format
 
   typing:
     runs-on: ubuntu-latest

instant_python/templates/boilerplate/github/release.yml

@@ -88,7 +88,7 @@ jobs:
         uses: ./.github/actions/python_setup
 
       - name: 🏃 Build package
-        run: {{ general.dependency_manager }} build
+        run: uv build
 
       - name: 🚀 Publish
         uses: pypa/gh-action-pypi-publish@release/v1

instant_python/templates/boilerplate/pyproject.toml

@@ -68,10 +68,7 @@ requires-python = "=={{ general.python_version }}.*"
 readme = "README.md"
 license = { file = "LICENSE" }
 
-{% if general.dependency_manager == "pdm" %}
-[tool.pdm]
-distribution = false
-{% endif %}
+
 {% if release_deps.strip() or lint_deps.strip() or test_deps.strip() %}
 [dependency-groups]
 dev = [
@@ -106,10 +103,8 @@ docs = [
 {% endif %}
 {% endif %}
 
-{% if general.dependency_manager == "uv" %}
 [tool.uv]
 exclude-newer = "3 days"
-{% endif %}
 
 {% if dependencies | has_dependency("ruff") or has_github_actions_or_makefile %}
 [tool.ruff]

instant_python/templates/boilerplate/scripts/makefile

@@ -1,5 +1,3 @@
-{% set has_uv = general.dependency_manager == "uv" %}
-{% set has_pdm = general.dependency_manager == "pdm" %}
 {% set has_pre_commit_hooks = "precommit_hook" in template.built_in_features %}
 {% set has_github_actions_or_makefile = ["github_actions", "makefile"] | is_in(template.built_in_features) %}
 {% set has_agents = "ai_agents" in template.built_in_features %}
@@ -16,120 +14,96 @@ local-setup:  ## Setup git hooks and install dependencies.
 	@echo "⌛ Setting up the project...\n"
 	@make install
 {% if has_pre_commit_hooks %}
-	@{{ general.dependency_manager }} run -m pre_commit install --hook-type pre-commit --hook-type commit-msg --hook-type pre-push
+	@uv run -m pre_commit install --hook-type pre-commit --hook-type commit-msg --hook-type pre-push
 {% endif %}
 
 .PHONY: install
 install:  ## Install dependencies.
 	@echo "⌛ Installing dependencies...\n"
-	{% if has_uv %}
 	@uv sync --all-groups
-	{% elif has_pdm %}
-	@pdm install
-	{% endif %}
 
 .PHONY: update
 update:  ## Update dependencies.
 	@echo "⌛ Updating dependencies...\n"
-	{% if has_uv %}
 	@uv lock --upgrade
 	@uv sync --all-groups
-	{% elif has_pdm %}
-	@pdm update
-	{% endif %}
 
 .PHONY: add-dep
 add-dep:  ## Add a new dependency
-	@{{ general.dependency_manager }} add $(dep)
+	@uv add $(dep)
 
 .PHONY: remove-dep
 remove-dep:  ## Remove a dependency
-	@{{ general.dependency_manager }} remove $(dep)
+	@uv remove $(dep)
 
 {% if dependencies | has_dependency("pytest") or has_github_actions_or_makefile %}
 .PHONY: test
 test:  ## Run all tests (optional: TESTS_PATH=tests/module/).
 	@echo "⌛ Running tests...\n"
-	@{{ general.dependency_manager }} run pytest $(or $(TESTS_PATH),test) -ra
+	@uv run pytest $(or $(TESTS_PATH),test) -ra
 
 .PHONY: unit
 unit:  ## Run all unit test (optional: TESTS_PATH=tests/module/).
 	@echo "⌛ Running unit tests...\n"
-	@{{ general.dependency_manager }} run pytest -m "unit" $(TESTS_PATH) -ra
+	@uv run pytest -m "unit" $(TESTS_PATH) -ra
 
 .PHONY: integration
 integration:  ## Run all integration test (optional: TESTS_PATH=tests/module/).
 	@echo "⌛ Running integration tests...\n"
-	@{{ general.dependency_manager }} run pytest -m "integration" $(TESTS_PATH) -ra
+	@uv run pytest -m "integration" $(TESTS_PATH) -ra
 
 .PHONY: acceptance
 acceptance:  ## Run all acceptance test (optional: TESTS_PATH=tests/module/).
 	@echo "⌛ Running acceptance tests...\n"
-	@{{ general.dependency_manager }} run pytest -m "acceptance" $(TESTS_PATH) -ra
+	@uv run pytest -m "acceptance" $(TESTS_PATH) -ra
 
 .PHONY: coverage
 coverage:  ## Run all test with coverage.
 	@echo "⌛ Running tests with coverage...\n"
-	@{{ general.dependency_manager }} run coverage run --branch -m pytest test
-	@{{ general.dependency_manager }} run coverage html
+	@uv run coverage run --branch -m pytest test
+	@uv run coverage html
 	@$(BROWSER) htmlcov/index.html
 {% endif %}
 {% if dependencies | has_dependency("pytest-watch") %}
 .PHONY: watch
 watch:  ## Run all test with every change.
 	@echo "⌛ Running test in watch mode...\n"
-	@{{ general.dependency_manager }} run ptw --runner "pytest test -ra"
+	@uv run ptw --runner "pytest test -ra"
 {% endif %}
 
 .PHONY: check-typing
 check-typing:  ## Run mypy type checking.
 	@echo "⌛ Running type checking...\n"
 {% if dependencies | has_dependency("mypy") or has_github_actions_or_makefile %}
-	@{{ general.dependency_manager }} run mypy
+	@uv run mypy
 {% elif dependencies | has_dependency("ty") or has_github_actions_or_makefile %}
-	@{{ general.dependency_manager }} run ty
+	@uv run ty
 {% elif dependencies | has_dependency("pyright") or has_github_actions_or_makefile %}
-	@{{ general.dependency_manager }} run pyright
+	@uv run pyright
 {% elif dependencies | has_dependency("pyrefly") or has_github_actions_or_makefile %}
-	@{{ general.dependency_manager }} run pyrefly
+	@uv run pyrefly
 {% endif %}
 
 {% if dependencies | has_dependency("ruff") or has_github_actions_or_makefile or has_pre_commit_hooks %}
 .PHONY: check-lint
 check-lint:  ## Run ruff linting check.
 	@echo "⌛ Running linting check...\n"
-	{% if has_pdm %}
-	@pdm run ruff check src test
-	{% elif has_uv %}
 	@uvx ruff check src test
-	{% endif %}
 
 .PHONY: lint
 lint:  ## Apply ruff linting fix.
 	@echo "\n⌛ Applying linting fixes...\n"
-	{% if has_pdm %}
-	@pdm run ruff check --fix src test
-	{% elif has_uv %}
 	@uvx ruff check --fix src test
-	{% endif %}
 
 .PHONY: check-format
 check-format:  ## Run ruff format check.
 	@echo "⌛ Checking code formatting...\n"
-	{% if has_pdm %}
-	@pdm run ruff format --check src test
-	{% elif has_uv %}
 	@uvx ruff format --check src test
-	{% endif %}
 
 .PHONY: format
 format:  ## Apply ruff format fix.
 	@echo "⌛ Formatting project code...\n"
-	{% if has_pdm %}
-	@pdm run ruff format src test
-	{% elif has_uv %}
 	@uvx ruff format src test
-	{% endif %}
 
 .PHONY: autostyle
 autostyle:  ## Apply all code style fixes.
@@ -142,22 +116,22 @@ autostyle:  ## Apply all code style fixes.
 .PHONY: secrets
 secrets: # Check for secrets in the source code
 	@echo "⌛ Checking secrets...\n"
-	@{{ general.dependency_manager }} run -m pre_commit run gitleaks --all-files
+	@uv run -m pre_commit run gitleaks --all-files
 {% endif %}
 
 {% if "github_actions" in template.built_in_features %}
 .PHONY: audit
 audit: # It audits dependencies and source code
 	@echo "⌛ Checking for vulnerabilities in dependencies...\n"
-	@{{ general.dependency_manager }} run -m pip_audit --progress-spinner off
+	@uv run -m pip_audit --progress-spinner off
 {% endif %}
 
 .PHONY: clean
 clean: # Clean up the project, removing the virtual environment and some files
 	@echo "\n⌛ Cleaning up the project...\n"
 
-	@{{ general.dependency_manager }} run -m pre_commit clean)
-	@{{ general.dependency_manager }} run -m pre_commit uninstall --hook-type pre-commit --hook-type commit-msg)
+	@uv run -m pre_commit clean)
+	@uv run -m pre_commit uninstall --hook-type pre-commit --hook-type commit-msg)
 	@rm --force --recursive .venv
 	@rm --force --recursive `find . -type f -name '*.py[co]'`
 	@rm --force --recursive `find . -name __pycache__`
@@ -171,20 +145,12 @@ clean: # Clean up the project, removing the virtual environment and some files
 
 .PHONY: show
 show:  ## Show installed dependencies.
-	{% if has_pdm %}
-	@pdm list
-	{% elif has_uv %}
 	@uv tree
-	{% endif %}
 
 .PHONY: search
 search:  ## Show package details.
 	@read -p "Enter package name to search: " package;\
-	{% if has_pdm %}
-	@pdm show $$package
-	{% elif has_uv %}
 	@uv pip show $$package
-	{% endif %}
 {% if has_agents %}
 .PHONY: claude
 claude:  ## Create symlinks for Claude Code compatibility (CLAUDE.md → AGENTS.md, .claude → .agents).

instant_python/version/application/version_updater.py

@@ -0,0 +1,21 @@
+from instant_python.version.domain.installation_method import InstallationMethod
+from instant_python.version.domain.installation_method_detector import InstallationMethodDetector
+from instant_python.version.domain.updater_resolver import UpdaterResolver
+
+
+class VersionUpdater:
+    def __init__(self, detector: InstallationMethodDetector, updater_resolver: UpdaterResolver) -> None:
+        self._detector = detector
+        self._updater_resolver = updater_resolver
+
+    def execute(self, version: str) -> InstallationMethod:
+        installation_method = self._detect_installation_method()
+        self._update_installed_version(installation_method, version)
+        return installation_method
+
+    def _update_installed_version(self, installation_method: InstallationMethod, version: str) -> None:
+        updater = self._updater_resolver.resolve(installation_method)
+        updater.update(version)
+
+    def _detect_installation_method(self) -> InstallationMethod:
+        return self._detector.detect()

instant_python/version/delivery/cli.py

@@ -0,0 +1,38 @@
+from pathlib import Path
+
+import typer
+from rich.console import Console
+
+from instant_python import __version__
+from instant_python.shared.infra.system_console import SystemConsole
+from instant_python.version.application.version_updater import VersionUpdater
+from instant_python.version.domain.updater import LATEST_VERSION
+from instant_python.version.infra.py_pi_version_repository import PyPiLatestLatestVersionRepository
+from instant_python.version.infra.system_installation_method_detector import SystemInstallationMethodDetector
+from instant_python.version.infra.updater_factory import UpdaterFactory
+from instant_python.version.infra.urllib_http_client import UrllibHttpClient
+
+app = typer.Typer()
+console = Console()
+
+
+@app.command("version", help="Show instant-python version")
+def show_version() -> None:
+    latest_version_repository = PyPiLatestLatestVersionRepository(client=UrllibHttpClient())
+    latest_version = latest_version_repository.get_latest_version()
+    current_version = __version__
+    console.print(f"{current_version} - (latest) {latest_version}")
+
+
+@app.command("update", help="Update instant-python to the latest version or a specific one")
+def update_version(
+    version: str = typer.Option(LATEST_VERSION, "--version", help="Specific version to install instead of the latest"),
+) -> None:
+    version_updater = VersionUpdater(
+        detector=SystemInstallationMethodDetector(),
+        updater_resolver=UpdaterFactory(console=SystemConsole(working_directory=str(Path.cwd()))),
+    )
+
+    console.print(f"Updating instant-python to {version}...")
+    installation_method = version_updater.execute(version)
+    console.print(f"instant-python updated successfully (installed via {installation_method.value})")

instant_python/version/domain/installation_method.py

@@ -0,0 +1,8 @@
+from enum import Enum
+
+
+class InstallationMethod(Enum):
+    BINARY = "binary"
+    PIPX = "pipx"
+    UV = "uv"
+    PIP = "pip"

instant_python/version/domain/installation_method_detector.py

@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+
+from instant_python.version.domain.installation_method import InstallationMethod
+
+
+class InstallationMethodDetector(ABC):
+    @abstractmethod
+    def detect(self) -> InstallationMethod:
+        raise NotImplementedError

instant_python/version/domain/latest_version.py

@@ -0,0 +1,13 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class LatestVersion:
+    version: str
+
+    @classmethod
+    def unknown(cls) -> "LatestVersion":
+        return cls("unknown")
+
+    def __repr__(self) -> str:
+        return self.version

instant_python/version/domain/latest_version_repository.py

@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+
+from instant_python.version.domain.latest_version import LatestVersion
+
+
+class LatestVersionRepository(ABC):
+    @abstractmethod
+    def get_latest_version(self) -> LatestVersion:
+        raise NotImplementedError

instant_python/version/domain/updater.py

@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+
+LATEST_VERSION = "latest"
+
+
+class Updater(ABC):
+    @abstractmethod
+    def update(self, version: str) -> None:
+        raise NotImplementedError

instant_python/version/domain/updater_resolver.py

@@ -0,0 +1,10 @@
+from abc import ABC, abstractmethod
+
+from instant_python.version.domain.installation_method import InstallationMethod
+from instant_python.version.domain.updater import Updater
+
+
+class UpdaterResolver(ABC):
+    @abstractmethod
+    def resolve(self, installation_method: InstallationMethod) -> Updater:
+        raise NotImplementedError