fix: remove dead deps, fix CI, clean unused imports

- Remove unused tomli-w dependency (never imported)
- Remove redundant toml optional-dep group
- Rename license optional-dep to licensing (remove duplicate)
- Remove unused Syntax import from cli.py
- Fix bare except blocks in loader.py (catch specific exceptions)
- Fix CI branch trigger to main (matches default branch)
- Fix CI coverage target to configdrift (was src)

Author: Coding-Dev-Tools

.github/workflows/ci.yml

@@ -1,10 +1,10 @@
 name: CI
 
 on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+push:
+  branches: [main]
+pull_request:
+  branches: [main]
 
 jobs:
   test:
@@ -29,5 +29,5 @@ jobs:
         run: pip install ruff && ruff check src/ --target-version py310
       - name: Run tests
         run: |
-          python -m pytest tests/ -v --cov=src --cov-report=term-missing
+          python -m pytest tests/ -v --cov=configdrift --cov-report=term-missing
 

pyproject.toml

@@ -22,20 +22,18 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "typer>=0.9.0",
-    "rich>=13.0.0",
-    "pyyaml>=6.0",
-    "tomli>=2.0.0; python_version < '3.11'",
-    "tomli-w>=1.0.0",
+  "typer>=0.9.0",
+  "rich>=13.0.0",
+  "pyyaml>=6.0",
+  "tomli>=2.0.0; python_version < '3.11'",
 ]
 
 [project.optional-dependencies]
+licensing = ["revenueholdings-license>=0.1.0"]
 dev = [
-    "pytest>=7.0.0",
-    "pytest-cov>=4.0.0",
+  "pytest>=7.0.0",
+  "pytest-cov>=4.0.0",
 ]
-toml = ["tomli>=2.0.0", "tomli-w>=1.0.0"]
-license = ["revenueholdings-license>=0.1.0"]
 
 [project.urls]
 Homepage = "https://github.com/Coding-Dev-Tools/configdrift"
@@ -58,7 +56,7 @@ line-length = 120
 
 [tool.ruff.lint]
 select = ["E", "F", "W", "I", "UP", "B", "SIM"]
-ignore = ["E501", "B008", "SIM108"]
+ignore = ["E501"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["*"]

src/configdrift/cli.py

@@ -1,11 +1,12 @@
 """ConfigDrift CLI entry point."""
 
-import typer
-from enum import Enum
 from pathlib import Path
+from typing import Dict, Any, Optional
+from enum import Enum
+
+import typer
 from rich.console import Console
 from rich.table import Table
-from typing import Any
 
 try:
     from revenueholdings_license import require_license
@@ -16,11 +17,13 @@ def require_license(product: str) -> None:  # type: ignore[misc]
         pass
 
 from configdrift import __version__
+from configdrift.loader import load_file
 from configdrift.diff import (
+    ChangeType,
     Severity,
+    diff_configs,
     diff_environments,
 )
-from configdrift.loader import load_file
 
 app = typer.Typer(
     name="configdrift",
@@ -68,20 +71,20 @@ def check(
         console.print("[red]ERROR: Provide at least 2 config files to compare.[/red]")
         raise typer.Exit(code=1)
 
-    env_configs: dict[str, dict[str, Any]] = {}
+    env_configs: Dict[str, Dict[str, Any]] = {}
     env_labels = []
 
     if len(files) == 2:
         env_labels = [baseline, target]
     else:
         env_labels = [f"file_{i+1}" for i in range(len(files))]
 
-    for label, filepath in zip(env_labels, files, strict=False):
+    for label, filepath in zip(env_labels, files):
         try:
             env_configs[label] = load_file(filepath)
         except Exception as e:
             console.print(f"[red]Error loading {filepath}: {e}[/red]")
-            raise typer.Exit(code=1) from e
+            raise typer.Exit(code=1)
 
     baseline_env = env_labels[0]
     results = diff_environments(env_configs, baseline_env=baseline_env)
@@ -100,7 +103,7 @@ def check(
         raise typer.Exit(code=1)
 
 
-def _output_table(results: dict[str, Any], baseline_env: str):
+def _output_table(results: Dict[str, Any], baseline_env: str):
     for env_name, diff_result in results.items():
         if not diff_result.changes:
             continue
@@ -132,7 +135,7 @@ def _output_table(results: dict[str, Any], baseline_env: str):
         console.print()
 
 
-def _output_json(results: dict[str, Any]):
+def _output_json(results: Dict[str, Any]):
     import json
     output = {}
     for env_name, diff_result in results.items():
@@ -155,16 +158,16 @@ def _output_json(results: dict[str, Any]):
 
 @app.command()
 def scan(
-    dirs: list[str] | None = typer.Argument(None, help="Directories containing config files. Each dir is treated as an environment."),
+    dirs: Optional[list[str]] = typer.Argument(None, help="Directories containing config files. Each dir is treated as an environment."),
     baseline: str = typer.Option("dev", "--baseline", "-b", help="Baseline directory name for comparison."),
-    config: str | None = typer.Option(None, "--config", "-c", help="Path to .configdrift.yaml config file."),
+    config: Optional[str] = typer.Option(None, "--config", "-c", help="Path to .configdrift.yaml config file."),
     output: OutputFormat = typer.Option(OutputFormat.TABLE, "--output", "-o", help="Output format."),
 ):
     """Scan directories of config files and compare environments."""
     if config:
         # Load config file for directory → env mapping (raw, not flattened)
         import yaml as _yaml
-        with open(config, encoding="utf-8") as _f:
+        with open(config, "r", encoding="utf-8") as _f:
             cfg_data = _yaml.safe_load(_f) or {}
         dir_mapping = cfg_data.get("environments", {})
     elif dirs:
@@ -181,7 +184,7 @@ def scan(
         console.print(f"[red]Baseline environment '{baseline}' not found.[/red]")
         raise typer.Exit(code=1)
 
-    env_configs: dict[str, dict[str, Any]] = {}
+    env_configs: Dict[str, Dict[str, Any]] = {}
     for env_name, dir_path in dir_mapping.items():
         env_configs[env_name] = {}
         p = Path(dir_path)