redeploy 0.2.9__tar.gz → 0.2.11__tar.gz

{redeploy-0.2.9 → redeploy-0.2.11}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.9
+Version: 0.2.11
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: pydantic>=2.0
 Requires-Dist: pyyaml>=6.0
+Requires-Dist: markdown-it-py>=3.0
 Requires-Dist: click>=8.0
 Requires-Dist: loguru>=0.7
 Requires-Dist: paramiko>=3.0
@@ -26,17 +27,17 @@ Requires-Dist: pfix>=0.1.60; extra == "dev"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.9-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.20-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-8.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.11-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-9.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $4.2000 (28 commits)
-- 👤 **Human dev:** ~$802 (8.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $4.5000 (30 commits)
+- 👤 **Human dev:** ~$898 (9.0h @ $100/h, 30min dedup)
 
 Generated on 2026-04-20 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.9-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.11-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.9 → redeploy-0.2.11}/README.md

@@ -3,17 +3,17 @@
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.9-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.20-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-8.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.11-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$4.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-9.0h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $4.2000 (28 commits)
-- 👤 **Human dev:** ~$802 (8.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $4.5000 (30 commits)
+- 👤 **Human dev:** ~$898 (9.0h @ $100/h, 30min dedup)
 
 Generated on 2026-04-20 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.9-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.11-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.9 → redeploy-0.2.11}/pyproject.toml

@@ -4,13 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "redeploy"
-version = "0.2.9"
+version = "0.2.11"
 description = "Infrastructure migration toolkit: detect → plan → apply"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "pydantic>=2.0",
     "pyyaml>=6.0",
+    "markdown-it-py>=3.0",
     "click>=8.0",
     "loguru>=0.7",
     "paramiko>=3.0",

{redeploy-0.2.9 → redeploy-0.2.11}/redeploy/__init__.py

@@ -7,7 +7,7 @@ Public API (stable from 0.2.0, semver guaranteed)::
 
 Everything not listed in ``__all__`` is internal and may change without notice.
 """
-__version__ = "0.2.9"
+__version__ = "0.2.11"
 
 # ── Core models ───────────────────────────────────────────────────────────────
 from .models import (  # noqa: F401

{redeploy-0.2.9 → redeploy-0.2.11}/redeploy/cli.py

@@ -853,7 +853,7 @@ def run(ctx, spec_file, dry_run, plan_only, do_detect, plan_out, output, env_nam
         redeploy run migration.yaml --detect --plan-out plan.yaml
     """
     from rich.console import Console
-    from .models import MigrationSpec, ProjectManifest
+    from .models import ProjectManifest
     from .plan import Planner
 
     console = Console()
@@ -868,7 +868,7 @@ def run(ctx, spec_file, dry_run, plan_only, do_detect, plan_out, output, env_nam
         console.print("[dim]  Create one with: redeploy init[/dim]")
         sys.exit(1)
 
-    spec = MigrationSpec.from_file(resolved_spec)
+    spec = _load_spec_or_exit(console, resolved_spec)
 
     # overlay manifest values — env-specific or global
     if manifest:
@@ -937,6 +937,16 @@ def _find_manifest_path() -> str:
     return "redeploy.yaml"
 
 
+def _load_spec_or_exit(console, path: str | Path):
+    from .spec_loader import SpecLoaderError, load_migration_spec
+
+    try:
+        return load_migration_spec(path)
+    except SpecLoaderError as exc:
+        console.print(f"[red]✗ {exc}[/red]")
+        sys.exit(1)
+
+
 def _resolve_device(console, device_id: str) -> tuple:
     """Resolve device from registry or auto-probe. Returns (device, registry) or (None, None)."""
     from .discovery import auto_probe
@@ -964,7 +974,7 @@ def _resolve_device(console, device_id: str) -> tuple:
 
 def _load_spec_with_manifest(console, spec_file: str | None, dev) -> "MigrationSpec":
     """Load spec and apply manifest/device overlays."""
-    from .models import MigrationSpec, ProjectManifest
+    from .models import ProjectManifest
 
     manifest = ProjectManifest.find_and_load(Path.cwd())
     resolved_spec = spec_file or (manifest.spec if manifest else "migration.yaml")
@@ -972,7 +982,7 @@ def _load_spec_with_manifest(console, spec_file: str | None, dev) -> "MigrationS
         console.print(f"[red]✗ spec not found: {resolved_spec}[/red]")
         sys.exit(1)
 
-    spec = MigrationSpec.from_file(resolved_spec)
+    spec = _load_spec_or_exit(console, resolved_spec)
     if manifest:
         manifest.apply_to_spec(spec)
 
@@ -1145,7 +1155,7 @@ def status(spec_file):
     """
     from rich.console import Console
     from rich.table import Table
-    from .models import MigrationSpec, ProjectManifest
+    from .models import ProjectManifest
 
     console = Console()
 
@@ -1163,7 +1173,7 @@ def status(spec_file):
     resolved = spec_file or (manifest.spec if manifest else "migration.yaml")
     spec_path = Path(resolved)
     if spec_path.exists():
-        spec = MigrationSpec.from_file(str(spec_path))
+        spec = _load_spec_or_exit(console, spec_path)
         if manifest:
             manifest.apply_to_spec(spec)
         console.print(f"\n[bold]{spec_path}[/bold]  [dim]{spec.name}[/dim]")

redeploy-0.2.11/redeploy/markpact/__init__.py

@@ -0,0 +1,14 @@
+from .compiler import MarkpactCompileError, compile_markpact_document, compile_markpact_document_to_data
+from .models import MarkpactBlock, MarkpactDocument
+from .parser import MarkpactParseError, parse_markpact_file, parse_markpact_text
+
+__all__ = [
+    "MarkpactBlock",
+    "MarkpactCompileError",
+    "MarkpactDocument",
+    "MarkpactParseError",
+    "compile_markpact_document",
+    "compile_markpact_document_to_data",
+    "parse_markpact_file",
+    "parse_markpact_text",
+]

redeploy-0.2.11/redeploy/markpact/compiler.py

@@ -0,0 +1,172 @@
+from __future__ import annotations
+
+import json
+import tomllib
+from pathlib import Path
+from typing import Any
+
+import yaml
+from pydantic import ValidationError
+
+from ..models import InfraSpec, MigrationSpec, MigrationStep
+from ..steps import StepLibrary
+from .models import MarkpactBlock, MarkpactDocument
+
+
+class MarkpactCompileError(ValueError):
+    """Raised when a markpact document cannot be compiled to MigrationSpec."""
+
+
+_SUPPORTED_BLOCK_KINDS = {"config", "steps"}
+_SUPPORTED_FORMATS = {"yaml", "toml", "json"}
+_ALLOWED_SPEC_KEYS = set(MigrationSpec.model_fields)
+_ALLOWED_INFRA_KEYS = set(InfraSpec.model_fields)
+_ALLOWED_STEP_KEYS = set(MigrationStep.model_fields) | {"insert_before"}
+_COMMON_CONFIG_WRAPPERS = {"deployment", "migration", "spec"}
+
+
+def compile_markpact_document(document: MarkpactDocument) -> MigrationSpec:
+    data = compile_markpact_document_to_data(document)
+    try:
+        return MigrationSpec(**data)
+    except ValidationError as exc:
+        raise MarkpactCompileError(
+            f"{document.path}: compiled markpact document does not match MigrationSpec: {exc}"
+        ) from exc
+
+
+def compile_markpact_document_to_data(document: MarkpactDocument) -> dict[str, Any]:
+    compiled: dict[str, Any] = {}
+    saw_config = False
+
+    for block in document.blocks:
+        if block.kind not in _SUPPORTED_BLOCK_KINDS:
+            raise MarkpactCompileError(
+                f"{document.path}:{block.start_line}: unsupported block kind 'markpact:{block.kind}'. "
+                "Phase 1 supports only markpact:config and markpact:steps."
+            )
+
+        payload = _load_block_payload(document.path, block)
+        if block.kind == "config":
+            saw_config = True
+            config_payload = _normalize_config_payload(payload, document.path, block)
+            _deep_merge(compiled, config_payload)
+            continue
+
+        steps = _extract_steps(payload, document.path, block)
+        compiled.setdefault("extra_steps", [])
+        compiled["extra_steps"].extend(steps)
+
+    if not saw_config:
+        raise MarkpactCompileError(
+            f"{document.path}: at least one markpact:config block is required."
+        )
+
+    return compiled
+
+
+def _load_block_payload(path: Path, block: MarkpactBlock) -> Any:
+    format_name = (block.format or "yaml").lower()
+    if format_name not in _SUPPORTED_FORMATS:
+        raise MarkpactCompileError(
+            f"{path}:{block.start_line}: unsupported payload format '{format_name}' for {block.label}."
+        )
+
+    content = block.content.strip()
+    if not content:
+        return {}
+
+    try:
+        if format_name == "yaml":
+            return yaml.safe_load(content) or {}
+        if format_name == "toml":
+            return tomllib.loads(content)
+        return json.loads(content)
+    except Exception as exc:
+        raise MarkpactCompileError(
+            f"{path}:{block.start_line}: failed to parse {block.label}: {exc}"
+        ) from exc
+
+
+def _normalize_config_payload(payload: Any, path: Path, block: MarkpactBlock) -> dict[str, Any]:
+    if isinstance(payload, dict) and len(payload) == 1:
+        key = next(iter(payload))
+        if key in _COMMON_CONFIG_WRAPPERS and isinstance(payload[key], dict):
+            payload = payload[key]
+
+    if not isinstance(payload, dict):
+        raise MarkpactCompileError(
+            f"{path}:{block.start_line}: {block.label} must compile to a mapping."
+        )
+
+    unknown_top = sorted(set(payload) - _ALLOWED_SPEC_KEYS)
+    if unknown_top:
+        raise MarkpactCompileError(
+            f"{path}:{block.start_line}: unsupported config keys: {', '.join(unknown_top)}"
+        )
+
+    for section in ("source", "target"):
+        if section not in payload:
+            continue
+        if not isinstance(payload[section], dict):
+            raise MarkpactCompileError(
+                f"{path}:{block.start_line}: '{section}' must be a mapping."
+            )
+        unknown_nested = sorted(set(payload[section]) - _ALLOWED_INFRA_KEYS)
+        if unknown_nested:
+            raise MarkpactCompileError(
+                f"{path}:{block.start_line}: unsupported {section} keys: {', '.join(unknown_nested)}"
+            )
+
+    return payload
+
+
+def _extract_steps(payload: Any, path: Path, block: MarkpactBlock) -> list[dict[str, Any]]:
+    if isinstance(payload, list):
+        steps = payload
+    elif isinstance(payload, dict) and "extra_steps" in payload:
+        steps = payload["extra_steps"]
+    else:
+        raise MarkpactCompileError(
+            f"{path}:{block.start_line}: {block.label} must define a list of steps or an extra_steps list."
+        )
+
+    if not isinstance(steps, list):
+        raise MarkpactCompileError(
+            f"{path}:{block.start_line}: extra_steps must be a list."
+        )
+
+    validated: list[dict[str, Any]] = []
+    for index, raw in enumerate(steps, start=1):
+        if not isinstance(raw, dict):
+            raise MarkpactCompileError(
+                f"{path}:{block.start_line}: step #{index} in {block.label} must be a mapping."
+            )
+
+        unknown_keys = sorted(set(raw) - _ALLOWED_STEP_KEYS)
+        if unknown_keys:
+            raise MarkpactCompileError(
+                f"{path}:{block.start_line}: unsupported step keys in '{raw.get('id', f'#{index}')}'"
+                f": {', '.join(unknown_keys)}"
+            )
+
+        raw_for_validation = dict(raw)
+        raw_for_validation.pop("insert_before", None)
+        try:
+            StepLibrary.resolve_from_spec(raw_for_validation)
+        except Exception as exc:
+            raise MarkpactCompileError(
+                f"{path}:{block.start_line}: step '{raw.get('id', f'#{index}')}' is not supported by the current runtime: {exc}"
+            ) from exc
+
+        validated.append(dict(raw))
+
+    return validated
+
+
+def _deep_merge(target: dict[str, Any], incoming: dict[str, Any]) -> None:
+    for key, value in incoming.items():
+        if key in target and isinstance(target[key], dict) and isinstance(value, dict):
+            _deep_merge(target[key], value)
+            continue
+        target[key] = value

redeploy-0.2.11/redeploy/markpact/models.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+from pathlib import Path
+
+
+@dataclass(frozen=True)
+class MarkpactBlock:
+    kind: str
+    format: str | None
+    content: str
+    start_line: int
+    end_line: int
+
+    @property
+    def label(self) -> str:
+        fmt = self.format or "yaml"
+        return f"markpact:{self.kind} {fmt}".strip()
+
+
+@dataclass(frozen=True)
+class MarkpactDocument:
+    path: Path
+    blocks: list[MarkpactBlock] = field(default_factory=list)

redeploy-0.2.11/redeploy/markpact/parser.py

@@ -0,0 +1,72 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from markdown_it import MarkdownIt
+
+from .models import MarkpactBlock, MarkpactDocument
+
+
+class MarkpactParseError(ValueError):
+    """Raised when a markdown markpact document cannot be parsed."""
+
+
+def parse_markpact_file(path: str | Path) -> MarkpactDocument:
+    file_path = Path(path)
+    return parse_markpact_text(file_path.read_text(encoding="utf-8"), path=file_path)
+
+
+def parse_markpact_text(text: str, *, path: str | Path = "migration.md") -> MarkpactDocument:
+    source_path = Path(path)
+    parser = MarkdownIt("commonmark")
+    tokens = parser.parse(text)
+    blocks: list[MarkpactBlock] = []
+
+    for token in tokens:
+        if token.type != "fence":
+            continue
+        parsed = _parse_markpact_fence_info(token.info)
+        if parsed is None:
+            continue
+
+        kind, format_name = parsed
+        start_line = (token.map[0] + 1) if token.map else 1
+        end_line = token.map[1] if token.map else start_line
+        blocks.append(MarkpactBlock(
+            kind=kind,
+            format=format_name,
+            content=token.content,
+            start_line=start_line,
+            end_line=end_line,
+        ))
+
+    if not blocks:
+        raise MarkpactParseError(
+            f"No markpact blocks found in {source_path}. Expected fenced blocks like ```markpact:config yaml."
+        )
+
+    return MarkpactDocument(path=source_path, blocks=blocks)
+
+
+def _parse_markpact_fence_info(info: str) -> tuple[str, str | None] | None:
+    tokens = [part for part in info.strip().split() if part]
+    if not tokens:
+        return None
+
+    kind: str | None = None
+    format_name: str | None = None
+
+    for token in tokens:
+        if token.startswith("markpact:"):
+            kind = token.split(":", 1)[1].strip().lower()
+            continue
+        if format_name is None and "=" not in token:
+            format_name = token.lower()
+
+    if not kind:
+        return None
+
+    if format_name is None and kind in {"config", "steps", "rollback"}:
+        format_name = "yaml"
+
+    return kind, format_name

redeploy-0.2.11/redeploy/spec_loader.py

@@ -0,0 +1,47 @@
+"""Load deployment specs from supported file formats."""
+from __future__ import annotations
+
+from pathlib import Path
+
+from .markpact import (
+    MarkpactCompileError,
+    MarkpactParseError,
+    compile_markpact_document,
+    parse_markpact_file,
+)
+from .models import MigrationSpec
+
+
+class SpecLoaderError(ValueError):
+    """Base error raised when a deployment spec cannot be loaded."""
+
+
+class UnsupportedSpecFormatError(SpecLoaderError):
+    """Raised when the spec file uses an unsupported format."""
+
+
+def load_migration_spec(path: str | Path) -> MigrationSpec:
+    """Load a deployment spec from disk.
+
+    Supported today:
+    - `.yaml`
+    - `.yml`
+
+    Supported markdown subset today:
+    - `.md` with markpact:config and markpact:steps blocks only
+    """
+    spec_path = Path(path)
+    suffix = spec_path.suffix.lower()
+
+    if suffix in {"", ".yaml", ".yml"}:
+        return MigrationSpec.from_file(spec_path)
+
+    if suffix == ".md":
+        try:
+            return compile_markpact_document(parse_markpact_file(spec_path))
+        except (MarkpactParseError, MarkpactCompileError) as exc:
+            raise SpecLoaderError(str(exc)) from exc
+
+    raise UnsupportedSpecFormatError(
+        f"Unsupported spec format '{suffix}': use YAML (.yaml or .yml)."
+    )

{redeploy-0.2.9 → redeploy-0.2.11}/redeploy/tests/test_cli.py

@@ -32,6 +32,64 @@ def _migration_yaml(strategy="docker_full", host="local") -> str:
     """)
 
 
+def _migration_markdown_supported() -> str:
+    return textwrap.dedent(
+        """\
+# Markdown migration
+
+```markpact:config yaml
+name: markdown migration
+description: migration loaded from markpact markdown
+source:
+  strategy: docker_full
+  host: local
+  app: myapp
+  version: "1.0.0"
+target:
+  strategy: docker_full
+  host: local
+  app: myapp
+  version: "1.0.1"
+  remote_dir: ~/myapp
+```
+
+```markpact:steps yaml
+extra_steps:
+  - id: sync_env
+    src: .env
+    dst: ~/myapp/.env
+```
+"""
+    )
+
+
+def _migration_markdown_with_unsupported_block() -> str:
+    return textwrap.dedent(
+        """\
+# Markdown migration
+
+```markpact:config yaml
+name: markdown migration
+source:
+  strategy: docker_full
+  host: local
+  app: myapp
+  version: "1.0.0"
+target:
+  strategy: docker_full
+  host: local
+  app: myapp
+  version: "1.0.1"
+  remote_dir: ~/myapp
+```
+
+```markpact:python
+print("unsupported in phase 1")
+```
+"""
+    )
+
+
 def _runner():
     return CliRunner(mix_stderr=False)
 
@@ -101,6 +159,24 @@ class TestRunPlanOnly:
             result = _runner().invoke(cli, ["run", str(spec), "--plan-only", "--env", "prod"])
         assert result.exit_code == 0
 
+    def test_run_plan_only_supports_markdown_subset(self, tmp_path):
+        spec = tmp_path / "migration.md"
+        spec.write_text(_migration_markdown_supported(), encoding="utf-8")
+
+        result = _runner().invoke(cli, ["run", str(spec), "--plan-only"])
+
+        assert result.exit_code == 0, result.output
+        assert "markdown migration" in result.output
+
+    def test_run_plan_only_rejects_unsupported_markdown_block(self, tmp_path):
+        spec = tmp_path / "migration.md"
+        spec.write_text(_migration_markdown_with_unsupported_block(), encoding="utf-8")
+
+        result = _runner().invoke(cli, ["run", str(spec), "--plan-only"])
+
+        assert result.exit_code == 1
+        assert "unsupported block kind 'markpact:python'" in result.output
+
 
 # ── redeploy status ───────────────────────────────────────────────────────────
 
@@ -123,6 +199,16 @@ class TestStatus:
         assert result.exit_code == 0
         assert "myapp" in result.output
 
+    def test_status_supports_markdown_subset(self, tmp_path):
+        spec = tmp_path / "migration.md"
+        spec.write_text(_migration_markdown_supported(), encoding="utf-8")
+
+        with patch("redeploy.models.ProjectManifest.find_and_load", return_value=None):
+            result = _runner().invoke(cli, ["status", str(spec)])
+
+        assert result.exit_code == 0, result.output
+        assert "markdown migration" in result.output
+
 
 # ── redeploy init ─────────────────────────────────────────────────────────────
 
@@ -192,6 +278,18 @@ class TestDevices:
         assert data[0]["id"] == "x@1"
 
 
+class TestTarget:
+    def test_target_supports_markdown_subset(self, tmp_path):
+        spec = tmp_path / "migration.md"
+        spec.write_text(_migration_markdown_supported(), encoding="utf-8")
+
+        with patch("redeploy.cli._resolve_device", return_value=(None, None)):
+            result = _runner().invoke(cli, ["target", "pi@192.168.1.42", str(spec), "--plan-only"])
+
+        assert result.exit_code == 0, result.output
+        assert "target" in result.output.lower()
+
+
 # ── redeploy apply ────────────────────────────────────────────────────────────