pypeline-runner 1.17.0__tar.gz → 1.18.1__tar.gz

{pypeline_runner-1.17.0 → pypeline_runner-1.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypeline-runner
-Version: 1.17.0
+Version: 1.18.1
 Summary: Configure and execute pipelines with Python (similar to GitHub workflows or Jenkins pipelines).
 License: MIT
 Author: cuinixam

{pypeline_runner-1.17.0 → pypeline_runner-1.18.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pypeline-runner"
-version = "1.17.0"
+version = "1.18.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.18.1/src/pypeline/__init__.py

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

{pypeline_runner-1.17.0 → pypeline_runner-1.18.1}/src/pypeline/bootstrap/run.py

@@ -298,12 +298,13 @@ class UnixVirtualEnvironment(VirtualEnvironment):
 
 
 class CreateVirtualEnvironment:
-    def __init__(self, root_dir: Path, package_manager: str) -> None:
+    def __init__(self, root_dir: Path, package_manager: str, skip_venv_creation: bool = False) -> None:
         self.root_dir = root_dir
         self.venv_dir = self.root_dir / ".venv"
         self.virtual_env = self.instantiate_os_specific_venv(self.venv_dir)
         self.package_manager = package_manager.replace('"', "").replace("'", "")
         self.execution_info_file = self.venv_dir / "virtual_env_exec_info.json"
+        self.skip_venv_creation = skip_venv_creation
 
     @property
     def package_manager_name(self) -> str:
@@ -320,14 +321,17 @@ class CreateVirtualEnvironment:
         return "install"
 
     def run(self) -> int:
-        self.virtual_env.create()
+        if not self.skip_venv_creation:
+            self.virtual_env.create()
+        else:
+            logger.info("Skipping virtual environment creation as requested.")
 
         # Get the PyPi source from pyproject.toml or Pipfile if it is defined
         pypi_source = PyPiSourceParser.from_pyproject(self.root_dir)
         if pypi_source:
             self.virtual_env.pip_configure(index_url=pypi_source.url, verify_ssl=True)
         # We need pip-system-certs in venv to use certificates, that are stored in the system's trust store,
-        pip_args = ["install", self.package_manager, "pip-system-certs"]
+        pip_args = ["install", self.package_manager, "pip-system-certs>=4.0,<5.0"]
         # but to install it, we need either a pip version with the trust store feature or to trust the host
         # (trust store feature enabled by default since 24.2)
         if Version(ensurepip.version()) < Version("24.2"):
@@ -377,9 +381,16 @@ def main() -> int:
             default=Path.cwd(),
             help="Specify the project directory (default: current working directory).",
         )
+        parser.add_argument(
+            "--skip-venv-creation",
+            action="store_true",
+            required=False,
+            default=False,
+            help="Skip the virtual environment creation process.",
+        )
         args = parser.parse_args()
 
-        CreateVirtualEnvironment(args.project_dir, package_manager=args.package_manager).run()
+        CreateVirtualEnvironment(args.project_dir, package_manager=args.package_manager, skip_venv_creation=args.skip_venv_creation).run()
     except UserNotificationException as e:
         logger.error(e)
         return 1

{pypeline_runner-1.17.0 → pypeline_runner-1.18.1}/src/pypeline/steps/create_venv.py

@@ -1,4 +1,5 @@
 import re
+import sys
 from dataclasses import dataclass
 from enum import Enum, auto
 from pathlib import Path
@@ -81,6 +82,12 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
                 cwd=self.project_root_dir,
             ).execute()
         else:
+            skip_venv_creation = False
+            python_executable = Path(sys.executable).absolute()
+            if python_executable.is_relative_to(self.project_root_dir):
+                self.logger.info(f"Detected that the python executable '{python_executable}' is from the virtual environment. Skip updating the virtual environment.")
+                skip_venv_creation = True
+
             # The internal bootstrap script supports arguments.
             bootstrap_args = [
                 "--project-dir",
@@ -88,6 +95,8 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
                 "--package-manager",
                 f'"{self.package_manager}"',
             ]
+            if skip_venv_creation:
+                bootstrap_args.append("--skip-venv-creation")
 
             # Copy the internal bootstrap script to the project root .bootstrap/bootstrap.py
             self.target_internal_bootstrap_script.parent.mkdir(exist_ok=True)

pypeline_runner-1.17.0/src/pypeline/__init__.py

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