pypeline-runner 1.16.1__py3-none-any.whl → 1.18.0__py3-none-any.whl

pypeline/__init__.py

@@ -1 +1 @@
-__version__ = "1.16.1"
+__version__ = "1.18.0"

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,7 +321,10 @@ 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)
@@ -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/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
@@ -41,7 +42,7 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
         self.bootstrap_script_type = BootstrapScriptType.CUSTOM if self.user_config.bootstrap_script else BootstrapScriptType.INTERNAL
         super().__init__(execution_context, group_name, config)
         self.logger = logger.bind()
-        self.bootstrap_script = get_bootstrap_script()
+        self.internal_bootstrap_script = get_bootstrap_script()
         self.package_manager = self.user_config.package_manager if self.user_config.package_manager else self.DEFAULT_PACKAGE_MANAGER
         self.python_executable = self.user_config.python_executable if self.user_config.python_executable else self.DEFAULT_PYTHON_EXECUTABLE
         self.venv_dir = self.project_root_dir / ".venv"
@@ -62,6 +63,10 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
         else:
             raise UserNotificationException(f"Could not extract the package manager name from {self.package_manager}")
 
+    @property
+    def target_internal_bootstrap_script(self) -> Path:
+        return self.project_root_dir.joinpath(".bootstrap/bootstrap.py")
+
     def get_name(self) -> str:
         return self.__class__.__name__
 
@@ -77,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",
@@ -84,10 +95,21 @@ 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)
+            if not self.target_internal_bootstrap_script.exists() or self.target_internal_bootstrap_script.read_text() != self.internal_bootstrap_script.read_text():
+                self.target_internal_bootstrap_script.write_text(self.internal_bootstrap_script.read_text())
+                self.logger.warning(f"Updated bootstrap script at {self.target_internal_bootstrap_script}")
+
+            # Run the copied bootstrap script
             self.execution_context.create_process_executor(
-                [self.python_executable, self.bootstrap_script.as_posix(), *bootstrap_args],
+                [self.python_executable, self.target_internal_bootstrap_script.as_posix(), *bootstrap_args],
                 cwd=self.project_root_dir,
             ).execute()
+
         return 0
 
     def get_inputs(self) -> List[Path]:
@@ -95,7 +117,10 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
         return [self.project_root_dir / file for file in package_manager_relevant_file]
 
     def get_outputs(self) -> List[Path]:
-        return [self.venv_dir]
+        outputs = [self.venv_dir]
+        if self.bootstrap_script_type == BootstrapScriptType.INTERNAL:
+            outputs.append(self.target_internal_bootstrap_script)
+        return outputs
 
     def get_config(self) -> Optional[dict[str, str]]:
         return {

{pypeline_runner-1.16.1.dist-info → pypeline_runner-1.18.0.dist-info}/METADATA

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

{pypeline_runner-1.16.1.dist-info → pypeline_runner-1.18.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-pypeline/__init__.py,sha256=vhCVkOpP49QwhvqtIDpwI9syYbmxe72X2L37kPeYGao,23
+pypeline/__init__.py,sha256=eOdR8Sg_yEJg0qk8bqKXxy1LJBKxzo3fV50mKHzE9zE,23
 pypeline/__run.py,sha256=TCdaX05Qm3g8T4QYryKB25Xxf0L5Km7hFOHe1mK9vI0,350
 pypeline/bootstrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypeline/bootstrap/run.py,sha256=iZS-VZGk2KnMRVOb3QuYPrTeINQqVdWkvgjEDpl8oQA,15927
+pypeline/bootstrap/run.py,sha256=STvSIzl6KpJj2lXbTeFr6mJnJQcjPR-BXD7enoWUlto,16436
 pypeline/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/domain/artifacts.py,sha256=5k7cVfHhLmvWXNuHKxXb9ca4Lxu0JytGQqazENCeKEU,1404
 pypeline/domain/config.py,sha256=6vWdHi7B6MA7NGi9wWXQE-YhSg1COSRmc3b1ji6AdAk,2053
@@ -21,12 +21,12 @@ pypeline/main.py,sha256=2mC2BDB1OWIXhaijBXG6Y1vfT8_yMZ4Dj55w5u7g7-w,4158
 pypeline/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/pypeline.py,sha256=-mquLfFlEvESk-HORhvjRMESIzdlVAgBLPjwUDOPLqg,7452
 pypeline/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypeline/steps/create_venv.py,sha256=ydRZ0gu7AKopWT1XkUBQw4kbepfgW9pj5a8P45hlob4,4839
+pypeline/steps/create_venv.py,sha256=ioL59vC1GbEk_EpUFMRRkWXk8W7z7QCEV-zgcho_lSg,6292
 pypeline/steps/env_setup_script.py,sha256=u08A6pvMccFQbcnU0xruFvpU30PbDrttnbOjl1gDqog,2340
 pypeline/steps/scoop_install.py,sha256=DDXBD-5TVaT-u6Yf7A85uWoCgBVmLvj9nPGrZ8OQCz0,3853
 pypeline/steps/west_install.py,sha256=hPyr28ksdKsQ0tv0gMNytzupgk1IgjN9CpmaBdX5zps,1947
-pypeline_runner-1.16.1.dist-info/LICENSE,sha256=sKxdoqSmW9ezvPvt0ZGJbneyA0SBcm0GiqzTv2jN230,1066
-pypeline_runner-1.16.1.dist-info/METADATA,sha256=MSmrSBNOgckKxcKnnf3_P1GLG6z-XpBvyqANvVOabIU,7553
-pypeline_runner-1.16.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pypeline_runner-1.16.1.dist-info/entry_points.txt,sha256=pe1u0uuhPI_yeQ0KjEw6jK-EvQfPcZwBSajgbAdKz1o,47
-pypeline_runner-1.16.1.dist-info/RECORD,,
+pypeline_runner-1.18.0.dist-info/LICENSE,sha256=sKxdoqSmW9ezvPvt0ZGJbneyA0SBcm0GiqzTv2jN230,1066
+pypeline_runner-1.18.0.dist-info/METADATA,sha256=yNndVifPIjTKD-7CI8z2ccPLVgMnP-R4BZa_vDhtFQw,7553
+pypeline_runner-1.18.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pypeline_runner-1.18.0.dist-info/entry_points.txt,sha256=pe1u0uuhPI_yeQ0KjEw6jK-EvQfPcZwBSajgbAdKz1o,47
+pypeline_runner-1.18.0.dist-info/RECORD,,

{pypeline_runner-1.16.1.dist-info → pypeline_runner-1.18.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any