dominicusin · Sep 5, 2026 · Sep 4, 2026 · Sep 4, 2026 · Sep 4, 2026 · Sep 5, 2026
@@ -92,6 +92,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v7
+      with:
+        fetch-depth: 0
+        fetch-tags: true
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v7

@@ -5,7 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.5.0] - 2026-08-31
+## [0.6.1] - 2026-09-04
+
+### Fixed
+- Version sync: `__init__.py`, `CITATION.cff`, web health/OpenAPI now read from `importlib.metadata` (single source of truth).
+- `PackageManagerType` enum now matches `PARSER_REGISTRY` keys exactly (removed Nix/Guix/Spack/XBPS without parsers; added pip/npm/cargo/etc.).
+- Auto parser selection via `get_parser(self.manager.value)` instead of hardcoded 4-entry map.
+- `EnhancedGreedySolver` now correctly inferred from instance (was falling back to `GREEDY`).
+- Web server now refuses to start without `PM_API_KEY` set (no more `dev-key-change-in-production` default).
+
+### Changed
+- CHANGELOG order: `[0.6.0]` moved above `[0.5.0]`.
+- Removed "Planned" section from `[0.6.0]` (JWT/Flask-Limiter are debt, not features).
+
+## [0.6.0] - 2026-09-02
 
 ### Added
 - Textual TUI (`pm tui`) for interactive terminal UX.

@@ -8,4 +8,4 @@ license: MIT
 repository-code: "https://github.com/dominicusin/package-maximizer"
 url: "https://pypi.org/project/package-maximizer/"
 keywords: [packaging, dependency-resolution, optimization]
-version: 0.1.0
+version: 0.6.1
@@ -4,7 +4,15 @@
 Использует различные SAT/ILP/SMT солверы для множественных пакетных менеджеров.
 """
 
-__version__ = "0.5.0"
+try:
+    from importlib.metadata import PackageNotFoundError, version as _dist_version
+
+    try:
+        __version__ = _dist_version("package-maximizer")
+    except PackageNotFoundError:
+        __version__ = "0.6.1"
+except ImportError:  # pragma: no cover — Python < 3.8
+    __version__ = "0.6.1"
 __author__ = "Package Maximizer Team"
 __email__ = "team@package-maximizer.dev"
 __license__ = "MIT"

@@ -4,18 +4,33 @@
 
 
 class PackageManagerType(Enum):
+    """Package managers supported by the parser registry.
+
+    Every value must have a matching entry in ``parsers.PARSER_REGISTRY``.
+    """
+
     APT = "apt"
     PACMAN = "pacman"
     DNF = "dnf"
-    ZYPPER = "zypper"
     BREW = "brew"
-    SPACK = "spack"
-    FLATPAK = "flatpak"
     SNAP = "snap"
-    NIX = "nix"
-    GUIX = "guix"
+    FLATPAK = "flatpak"
+    CARGO = "cargo"
+    NPM = "npm"
+    CONDA = "conda"
     PORTAGE = "portage"
-    XBS = "xbps"
+    APK = "apk"
+    ZYPPER = "zypper"
+    YUM = "yum"
+    PIP = "pip"
+    GEM = "gem"
+    YARN = "yarn"
+    COMPOSER = "composer"
+    VCPKG = "vcpkg"
+    NUGET = "nuget"
+    WINGET = "winget"
+    SCOOP = "scoop"
+    CHOCO = "choco"
 
 
 class SolverType(Enum):

@@ -106,6 +106,7 @@ def _infer_solver_type(self, solver) -> SolverType:
         # Соответствие имен классов типам солверов
         solver_map = {
             'greedysolver': SolverType.GREEDY,
+            'enhancedgreedysolver': SolverType.ENHANCED_GREEDY,
             'z3solver': SolverType.Z3,
             'pulpsolver': SolverType.PULP,
             'ortoolssolver': SolverType.ORTOOLS,
@@ -120,22 +121,17 @@ def _get_parser_instance(self, parser) -> PackageParser | None:
         Получение экземпляра парсера.
         """
         if parser is None:
-            # Автоматический выбор парсера по менеджеру
-            parser_map = {
-                PackageManagerType.APT: "apt",
-                PackageManagerType.PACMAN: "pacman",
-                PackageManagerType.DNF: "dnf",
-                PackageManagerType.BREW: "brew",
-            }
-            parser_name = parser_map.get(self.manager, "apt")
+            # Автоматический выбор парсера по менеджеру (через registry)
             from ..parsers import get_parser
+
             try:
-                return get_parser(parser_name)
+                return get_parser(self.manager.value)
             except ValueError:
                 return None
 
         if isinstance(parser, str):
             from ..parsers import get_parser
+
             try:
                 return get_parser(parser)
             except ValueError:

@@ -17,7 +17,17 @@
 app = Flask(__name__)
 
 # ─── Configuration ───────────────────────────────────────────
-API_KEY = os.environ.get("PM_API_KEY", "dev-key-change-in-production")
+try:
+    from importlib.metadata import PackageNotFoundError, version as _dist_version
+
+    try:
+        APP_VERSION = _dist_version("package-maximizer")
+    except PackageNotFoundError:
+        APP_VERSION = "0.6.1"
+except ImportError:  # pragma: no cover
+    APP_VERSION = "0.6.1"
+
+API_KEY = os.environ.get("PM_API_KEY", "")
 CACHE_ENABLED = os.environ.get("PM_CACHE_ENABLED", "true").lower() == "true"
 CACHE_TTL = int(os.environ.get("PM_CACHE_TTL", "3600"))
 
@@ -169,7 +179,7 @@ def health() -> tuple[dict, int]:
         jsonify(
             {
                 "status": "ok",
-                "version": "0.5.0",
+                "version": APP_VERSION,
                 "cache_enabled": CACHE_ENABLED,
                 "timestamp": time.time(),
             }
@@ -547,7 +557,7 @@ def openapi_spec() -> tuple[dict, int]:
         "openapi": "3.0.3",
         "info": {
             "title": "Package Maximizer API",
-            "version": "0.5.0",
+            "version": APP_VERSION,
             "description": "Maximize a consistent set of packages across managers.",
         },
         "security": [{"ApiKeyAuth": []}],
@@ -636,6 +646,15 @@ def api_docs() -> tuple[str, int]:
 # ─── Run app ─────────────────────────────────────────────────
 def run_app(host: str = "127.0.0.1", port: int = 5000, debug: bool = False) -> None:
     """Run the Flask application."""
+    if not API_KEY:
+        import sys
+        print(
+            "ERROR: PM_API_KEY environment variable is required to start the web server.\n"
+            "Set it with: export PM_API_KEY=your-secret-key\n"
+            "Or start with: PM_API_KEY=xxx pm-web",
+            file=sys.stderr,
+        )
+        sys.exit(1)
     app.run(host=host, port=port, debug=debug)
 
 

@@ -76,7 +76,7 @@ Repository = "https://github.com/dominicusin/package-maximizer.git"
 PyPI = "https://pypi.org/project/package-maximizer/"
 
 [tool.setuptools_scm]
-fallback_version = "0.6.0"
+fallback_version = "0.6.1"
 
 [tool.package-maximizer]
 plugin-metadata-version = "1"
@@ -0,0 +1,7 @@
+"""Root conftest — sets PM_API_KEY before test modules import web.app."""
+
+import os
+
+# Ensure PM_API_KEY is set BEFORE any test module imports
+# ``package_maximizer.web.app`` (which reads it at import time).
+os.environ.setdefault("PM_API_KEY", "test-key-for-tests")
@@ -11,7 +11,9 @@ def test_import():
         import package_maximizer
 
         assert hasattr(package_maximizer, "__version__")
-        assert package_maximizer.__version__ == "0.5.0"
+        # Accept both release (0.6.1) and dev (0.6.2.dev1+...) versions
+        ver = package_maximizer.__version__
+        assert ver.startswith("0.6"), f"Expected 0.6.x, got {ver}"
     except ImportError:
         assert False, "Failed to import package_maximizer"
 

@@ -244,6 +244,6 @@ def test_version_reports_package_version(self):
         runner = CliRunner()
         result = runner.invoke(cli, ["version"])
         assert result.exit_code == 0
-        assert "0.5" in result.output
+        assert "0.6" in result.output
 
 
@@ -62,6 +62,7 @@ def test_load_json_file(self, tmp_path, monkeypatch):
 
     def test_load_yaml_file(self, tmp_path, monkeypatch):
         monkeypatch.delenv("PM_CONFIG", raising=False)
+        monkeypatch.delenv("PM_API_KEY", raising=False)
         p = tmp_path / "cfg.yaml"
         p.write_text("default_manager: dnf\napi_key: secret-123\n")
         cfg = load_config(p)

@@ -82,6 +82,11 @@ def test_minisat(self):
         from package_maximizer.solvers import MiniSatSolver
         assert pm._infer_solver_type(MiniSatSolver()) == SolverType.MINISAT
 
+    def test_enhanced_greedy(self):
+        pm = PackageMaximizer(manager="apt", solver="greedy")
+        from package_maximizer.solvers import EnhancedGreedySolver
+        assert pm._infer_solver_type(EnhancedGreedySolver()) == SolverType.ENHANCED_GREEDY
+
     def test_unknown_defaults_to_greedy(self):
         pm = PackageMaximizer(manager="apt", solver="greedy")
         assert pm._infer_solver_type(object()) == SolverType.GREEDY
@@ -113,6 +118,22 @@ def test_object_parser_passthrough(self):
         result = pm._get_parser_instance(parser_obj)
         assert result is parser_obj
 
+    def test_pip_manager_gets_pip_parser(self):
+        """Regression: manager='pip' should auto-select PipParser, not APTParser."""
+        pm = PackageMaximizer(manager="pip", solver="greedy")
+        assert pm.parser is not None
+        assert pm.parser.__class__.__name__ == "PipParser"
+
+    def test_npm_manager_gets_npm_parser(self):
+        """Regression: manager='npm' should auto-select NpmParser."""
+        pm = PackageMaximizer(manager="npm", solver="greedy")
+        assert pm.parser is not None
+        assert pm.parser.__class__.__name__ == "NpmParser"
+
+    def test_unknown_string_returns_none(self):
+        pm = PackageMaximizer(manager="apt", solver="greedy")
+        parser = pm._get_parser_instance("totally_unknown_parser_zzz")
+        assert parser is None
 
 class TestGetAnalyzerInstance:
     """_get_analyzer_instance with None, str, and object."""

@@ -252,7 +252,8 @@ def client(self):
 
     @pytest.fixture
     def auth_headers(self):
-        return {"X-API-Key": "dev-key-change-in-production"}
+        import os
+        return {"X-API-Key": os.environ.get("PM_API_KEY", "test-key-for-tests")}
 
     def test_health_check(self, client):
         """Health endpoint should work without auth."""

@@ -32,6 +32,12 @@ class TestPulPSolverAvailable:
     def test_pulp_available_true_when_imported(self):
         from package_maximizer.solvers import pulp_solver
         # If we can import pulp_solver, PULP_AVAILABLE should be True
+        # Skip when pulp is not installed
+        import importlib
+        try:
+            importlib.import_module("pulp")
+        except ImportError:
+            pytest.skip("pulp not installed")
         assert pulp_solver.PULP_AVAILABLE is True
 
 

@@ -10,11 +10,10 @@
 
 import pytest
 
-# NOTE: do NOT override PM_API_KEY here — package_maximizer.web.app reads it once
-# at import time. The default dev key is used, matching tests/test_integration.py.
+# NOTE: PM_API_KEY is set via tests/conftest.py before this module imports.
 from package_maximizer.web.app import app
 
-DEFAULT_KEY = "dev-key-change-in-production"
+DEFAULT_KEY = os.environ.get("PM_API_KEY", "test-key-for-tests")
 
 
 @pytest.fixture