pypeline-runner 1.22.0__tar.gz → 1.23.1__tar.gz

{pypeline_runner-1.22.0 → pypeline_runner-1.23.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypeline-runner
-Version: 1.22.0
+Version: 1.23.1
 Summary: Configure and execute pipelines with Python (similar to GitHub workflows or Jenkins pipelines).
 License: MIT
 License-File: LICENSE

{pypeline_runner-1.22.0 → pypeline_runner-1.23.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pypeline-runner"
-version = "1.22.0"
+version = "1.23.1"
 description = "Configure and execute pipelines with Python (similar to GitHub workflows or Jenkins pipelines)."
 authors = ["cuinixam <me@cuinixam.com>"]
 license = "MIT"

pypeline_runner-1.23.1/src/pypeline/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.23.1"

{pypeline_runner-1.22.0 → pypeline_runner-1.23.1}/src/pypeline/bootstrap/run.py

@@ -632,22 +632,31 @@ class CreateVirtualEnvironment(Runnable):
         except OSError as exc:
             logger.warning(f"Could not write Python version marker: {exc}")
 
+    def _set_env_var(self, key: str, value: str) -> None:
+        """Helper method to set environment variables (easier to mock in tests)."""
+        os.environ[key] = value
+
     def _ensure_in_project_venv(self) -> None:
         """Configure package managers to create venv in-project (.venv in repository)."""
         if self.package_manager_name == "poetry":
             # Set environment variable for poetry to create venv in-project
-            os.environ["POETRY_VIRTUALENVS_IN_PROJECT"] = "true"
+            self._set_env_var("POETRY_VIRTUALENVS_IN_PROJECT", "true")
         elif self.package_manager_name == "pipenv":
             # Set environment variable for pipenv
-            os.environ["PIPENV_VENV_IN_PROJECT"] = "1"
+            self._set_env_var("PIPENV_VENV_IN_PROJECT", "1")
         # UV creates .venv in-project by default, no configuration needed
 
     def _ensure_correct_python_version(self) -> None:
         """Ensure the correct Python version is used in the virtual environment."""
         if self.package_manager_name == "poetry":
             # Make Poetry use the Python interpreter it's being run with
-            os.environ["POETRY_VIRTUALENVS_PREFER_ACTIVE_PYTHON"] = "false"
-            os.environ["POETRY_VIRTUALENVS_USE_POETRY_PYTHON"] = "true"
+            self._set_env_var("POETRY_VIRTUALENVS_PREFER_ACTIVE_PYTHON", "false")
+            self._set_env_var("POETRY_VIRTUALENVS_USE_POETRY_PYTHON", "true")
+        elif self.package_manager_name == "uv":
+            # Make UV use the Python interpreter it's being run with
+            self._set_env_var("UV_PYTHON", self.config.python_version)
+            self._set_env_var("UV_MANAGED_PYTHON", "false")
+            self._set_env_var("UV_NO_PYTHON_DOWNLOADS", "true")
 
     def _get_install_argument(self) -> str:
         if self.package_manager_name == "uv":

{pypeline_runner-1.22.0 → pypeline_runner-1.23.1}/src/pypeline/steps/create_venv.py

@@ -2,6 +2,7 @@ import io
 import json
 import re
 import shutil
+import subprocess
 import sys
 import traceback
 from dataclasses import dataclass
@@ -85,17 +86,73 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
             ]
         )
 
+    def _verify_python_version(self, executable: str, expected_version: str) -> bool:
+        """
+        Verify that a Python executable matches the expected version.
+
+        Args:
+        ----
+            executable: Name or path of Python executable to check
+            expected_version: Expected version string (e.g., "3.11" or "3.11.5")
+
+        Returns:
+        -------
+            True if the executable's version matches expected_version (ignoring patch),
+            False otherwise or if the executable cannot be queried.
+
+        """
+        try:
+            # Run python --version to get the version string
+            result = subprocess.run(
+                [executable, "--version"],  # noqa: S603
+                capture_output=True,
+                text=True,
+                check=False,
+            )
+
+            if result.returncode != 0:
+                return False
+
+            # Parse version from output (e.g., "Python 3.11.5")
+            version_output = result.stdout.strip()
+            match = re.match(r"Python\s+(\d+)\.(\d+)(?:\.\d+)?", version_output)
+            if not match:
+                self.logger.warning(f"Could not parse version from: {version_output}")
+                return False
+
+            actual_major = match.group(1)
+            actual_minor = match.group(2)
+
+            # Parse expected version
+            expected_parts = expected_version.split(".")
+            if len(expected_parts) == 0:
+                return False
+
+            expected_major = expected_parts[0]
+            # If only major version specified, only compare major
+            if len(expected_parts) == 1:
+                return actual_major == expected_major
+
+            # Compare major.minor
+            expected_minor = expected_parts[1]
+            return actual_major == expected_major and actual_minor == expected_minor
+
+        except (FileNotFoundError, OSError) as e:
+            self.logger.debug(f"Failed to verify Python version for {executable}: {e}")
+            return False
+
     def _find_python_executable(self, python_version: str) -> Optional[str]:
         """
         Find Python executable based on version string.
 
         Supports version formats:
-        - "3.11.5" or "3.11" -> tries python3.11, python311
-        - "3" -> tries python3
+        - "3.11.5" or "3.11" -> tries python3.11, python311, then falls back to python
+        - "3" -> tries python3, then falls back to python
 
-        Always ignores patch version. No fallbacks to generic python.
+        Always ignores patch version. Falls back to generic 'python' if version-specific
+        executables are not found, but verifies the version matches.
 
-        Returns the first executable found in PATH, or None if not found.
+        Returns the first executable found in PATH, or None if not found or version mismatch.
         """
         # Handle empty string
         if not python_version:
@@ -133,7 +190,16 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
                 self.logger.debug(f"Found Python executable: {executable_path} (candidate: {candidate})")
                 return candidate
 
-        # No fallback - return None if specific version not found
+        # Fallback to generic 'python' executable with version verification
+        self.logger.debug(f"No version-specific Python executable found for {python_version}, trying generic 'python'")
+        if shutil.which("python"):
+            if self._verify_python_version("python", python_version):
+                self.logger.info(f"Using generic 'python' executable (verified as Python {python_version})")
+                return "python"
+            else:
+                self.logger.warning(f"Generic 'python' executable found but version does not match {python_version}")
+
+        # No suitable executable found
         return None
 
     @property

pypeline_runner-1.23.1/src/pypeline/steps/env_setup_script.py

@@ -0,0 +1,117 @@
+import platform
+from pathlib import Path
+from typing import Any, Dict, List, Optional
+
+from py_app_dev.core.env_setup_scripts import BatEnvSetupScriptGenerator, EnvSetupScriptGenerator, Ps1EnvSetupScriptGenerator
+from py_app_dev.core.logging import logger
+
+from pypeline.domain.execution_context import ExecutionContext
+from pypeline.domain.pipeline import PipelineStep
+
+
+def read_dot_env_file(dot_env_file: Path) -> Dict[str, str]:
+    """Reads a .env file and returns a dictionary of environment variables."""
+    env_vars = {}
+    with dot_env_file.open("r") as f:
+        for line in f:
+            line = line.strip()
+            if line and not line.startswith("#"):
+                key, value = line.split("=", 1)
+                env_vars[key.strip()] = value.strip().strip('"').strip("'")
+    return env_vars
+
+
+class ShEnvSetupScriptGenerator(EnvSetupScriptGenerator):
+    """Generates a bash/sh script to set environment variables and update PATH."""
+
+    def generate_content(self) -> str:
+        lines = ["#!/bin/bash"]
+
+        for key, value in self.environment.items():
+            # Escape single quotes by replacing ' with '\''
+            # This closes the string, adds an escaped quote, then reopens the string
+            escaped_value = value.replace("'", "'\\''")
+            # Use single quotes for the value to prevent variable expansion
+            lines.append(f"export {key}='{escaped_value}'")
+
+        if self.install_dirs:
+            # Convert to POSIX paths to ensure forward slashes on all platforms
+            path_string = ":".join([path.as_posix() for path in self.install_dirs])
+            # Escape single quotes in paths
+            escaped_path_string = path_string.replace("'", "'\\''")
+            lines.append(f"export PATH='{escaped_path_string}':\"$PATH\"")
+        else:
+            self.logger.debug("No install directories provided for PATH update.")
+        lines.append("")
+
+        return "\n".join(lines)
+
+
+class GenerateEnvSetupScript(PipelineStep[ExecutionContext]):
+    def __init__(self, execution_context: ExecutionContext, group_name: Optional[str], config: Optional[Dict[str, Any]] = None) -> None:
+        super().__init__(execution_context, group_name, config)
+        self._generated_scripts: List[Path] = []
+
+    def run(self) -> None:
+        logger.info(f"Generating environment setup scripts under {self.output_dir} ...")
+
+        # Read the .env file and set up the environment variables
+        dot_env_file = self.execution_context.project_root_dir.joinpath(".env")
+        if dot_env_file.exists():
+            logger.debug(f"Reading .env file: {dot_env_file}")
+            env_vars = read_dot_env_file(dot_env_file)
+        else:
+            logger.info(f".env file not found: {dot_env_file}.")
+            env_vars = {}
+
+        # Merge execution context environment variables
+        env_vars.update(self.execution_context.env_vars)
+        # Update the execution context with the merged environment variables to ensure they are available for subsequent steps
+        self.execution_context.env_vars.update(env_vars)
+
+        # Get generate-all option and detect OS
+        generate_all = self.execution_context.get_input("generate-all") or False
+        is_windows = platform.system() == "Windows"
+
+        # Generate Windows scripts if on Windows OR generate-all is True
+        if is_windows or generate_all:
+            bat_script = self.output_dir.joinpath("env_setup.bat")
+            BatEnvSetupScriptGenerator(
+                install_dirs=self.execution_context.install_dirs,
+                environment=env_vars,
+                output_file=bat_script,
+            ).to_file()
+            self._generated_scripts.append(bat_script)
+
+            ps1_script = self.output_dir.joinpath("env_setup.ps1")
+            Ps1EnvSetupScriptGenerator(
+                install_dirs=self.execution_context.install_dirs,
+                environment=env_vars,
+                output_file=ps1_script,
+            ).to_file()
+            self._generated_scripts.append(ps1_script)
+
+        # Generate Unix/Linux/macOS script if NOT on Windows OR generate-all is True
+        if not is_windows or generate_all:
+            sh_script = self.output_dir.joinpath("env_setup.sh")
+            ShEnvSetupScriptGenerator(
+                install_dirs=self.execution_context.install_dirs,
+                environment=env_vars,
+                output_file=sh_script,
+            ).to_file()
+            self._generated_scripts.append(sh_script)
+
+    def get_inputs(self) -> List[Path]:
+        return []
+
+    def get_outputs(self) -> List[Path]:
+        return self._generated_scripts
+
+    def get_name(self) -> str:
+        return self.__class__.__name__
+
+    def update_execution_context(self) -> None:
+        pass
+
+    def get_needs_dependency_management(self) -> bool:
+        return False

pypeline_runner-1.22.0/src/pypeline/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.22.0"

pypeline_runner-1.22.0/src/pypeline/steps/env_setup_script.py

@@ -1,65 +0,0 @@
-from pathlib import Path
-from typing import Dict, List
-
-from py_app_dev.core.env_setup_scripts import BatEnvSetupScriptGenerator, Ps1EnvSetupScriptGenerator
-from py_app_dev.core.logging import logger
-
-from pypeline.domain.execution_context import ExecutionContext
-from pypeline.domain.pipeline import PipelineStep
-
-
-def read_dot_env_file(dot_env_file: Path) -> Dict[str, str]:
-    """Reads a .env file and returns a dictionary of environment variables."""
-    env_vars = {}
-    with dot_env_file.open("r") as f:
-        for line in f:
-            line = line.strip()
-            if line and not line.startswith("#"):
-                key, value = line.split("=", 1)
-                env_vars[key.strip()] = value.strip().strip('"').strip("'")
-    return env_vars
-
-
-class GenerateEnvSetupScript(PipelineStep[ExecutionContext]):
-    def run(self) -> None:
-        logger.info(f"Generating environment setup scripts under {self.output_dir} ...")
-        # Read the .env file and set up the environment variables
-        dot_env_file = self.execution_context.project_root_dir.joinpath(".env")
-        if dot_env_file.exists():
-            logger.debug(f"Reading .env file: {dot_env_file}")
-            env_vars = read_dot_env_file(dot_env_file)
-        else:
-            logger.warning(f".env file not found: {dot_env_file}")
-            env_vars = {}
-
-        # Merge execution context environment variables
-        env_vars.update(self.execution_context.env_vars)
-        # Update the execution context with the merged environment variables to ensure they are available for subsequent steps
-        self.execution_context.env_vars.update(env_vars)
-
-        # Generate the environment setup scripts
-        BatEnvSetupScriptGenerator(
-            install_dirs=self.execution_context.install_dirs,
-            environment=env_vars,
-            output_file=self.output_dir.joinpath("env_setup.bat"),
-        ).to_file()
-        Ps1EnvSetupScriptGenerator(
-            install_dirs=self.execution_context.install_dirs,
-            environment=env_vars,
-            output_file=self.output_dir.joinpath("env_setup.ps1"),
-        ).to_file()
-
-    def get_inputs(self) -> List[Path]:
-        return []
-
-    def get_outputs(self) -> List[Path]:
-        return []
-
-    def get_name(self) -> str:
-        return self.__class__.__name__
-
-    def update_execution_context(self) -> None:
-        pass
-
-    def get_needs_dependency_management(self) -> bool:
-        return False