pypeline-runner 1.14.0__py3-none-any.whl → 1.15.1__py3-none-any.whl

pypeline/inputs_parser.py

@@ -1,5 +1,4 @@
 import argparse
-import distutils.util
 from typing import Any, Dict, List
 
 from py_app_dev.core.exceptions import UserNotificationException
@@ -13,7 +12,7 @@ def _map_type_for_argparse(input_type: InputType) -> Any:
     elif input_type == "integer":
         return int
     elif input_type == "boolean":
-        return lambda x: bool(distutils.util.strtobool(x))
+        return argparse.BooleanOptionalAction  # Use BooleanOptionalAction for boolean arguments
     else:
         raise ValueError(f"Unsupported input type specified: {input_type}")
 
@@ -37,14 +36,23 @@ def create_argument_parser_from_definitions(
             help_text += f", Default: {definition.default}"
         help_text += ")"
 
-        parser.add_argument(
-            f"--{name}",
-            dest=name,  # Attribute name in the parsed namespace
-            help=help_text,
-            type=arg_type,  # Type conversion function
-            required=definition.required,
-            default=definition.default,
-        )
+        if definition.type == "boolean":
+            parser.add_argument(
+                f"--{name}",
+                dest=name,  # Attribute name in the parsed namespace
+                help=help_text,
+                action=arg_type,  # Use BooleanOptionalAction for boolean arguments
+                default=definition.default or False,
+            )
+        else:
+            parser.add_argument(
+                f"--{name}",
+                dest=name,
+                help=help_text,
+                type=arg_type,
+                required=definition.required,
+                default=definition.default,
+            )
 
     return parser
 
@@ -69,11 +77,13 @@ class InputsParser:
         try:
             args = []
             for item in inputs:
-                if "=" not in item:
-                    raise UserNotificationException(f"Invalid input format: '{item}', expected 'name=value'")
-                name, value = item.split("=", 1)
-                args.append(f"--{name}")
-                args.append(value)
+                if "=" in item:
+                    name, value = item.split("=", 1)
+                    args.append(f"--{name}")
+                    if value:
+                        args.append(value)
+                else:
+                    args.append(f"--{item}")
 
             parsed_namespace = self.parser.parse_args(args)
             return vars(parsed_namespace)

pypeline/kickstart/templates/project/pypeline.yaml

@@ -8,7 +8,8 @@ pipeline:
   - step: CreateVEnv
     module: pypeline.steps.create_venv
     config:
-      bootstrap_script: .bootstrap/bootstrap.py
+      package_manager: uv>=0.6
+      python_executable: python3
   - step: WestInstall
     module: pypeline.steps.west_install
     description: Download external modules

pypeline/kickstart/templates/project/pyproject.toml

@@ -1,11 +1,13 @@
-[tool.poetry]
-name = "Hello Pypeline"
+[project]
+name = "hello-pypeline"
 version = "0.0.1"
 description = "A simple generated project to get you started"
-authors = ["Your Name"]
-package-mode = false
-
-[tool.poetry.dependencies]
-python = ">=3.10,<4.0"
-pypeline-runner = "*"
-west = "*"
+authors = [
+    {name = "Your Name"},
+]
+requires-python = "<4.0,>=3.10"
+dependencies = [
+    "pypeline-runner>=1,<2",
+    "west>=1,<2",
+    "wrapt>=1,<2",
+]

pypeline/kickstart/templates/project/steps/my_step.py

@@ -12,6 +12,7 @@ class MyStep(PipelineStep[ExecutionContext]):
         logger.info(f"Run {self.get_name()} found install dirs:")
         for install_dir in self.execution_context.install_dirs:
             logger.info(f" {install_dir}")
+        logger.info(f"my_input: {self.execution_context.get_input('my_input')}")
 
     def get_inputs(self) -> List[Path]:
         return []

pypeline/steps/create_venv.py

@@ -3,18 +3,19 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from mashumaro import DataClassDictMixin
-from py_app_dev.core.exceptions import UserNotificationException
 from py_app_dev.core.logging import logger
 
+from pypeline.bootstrap.run import get_bootstrap_script
+
 from ..domain.execution_context import ExecutionContext
 from ..domain.pipeline import PipelineStep
 
-DEFAULT_BOOTSTRAP_SCRIPT = "bootstrap.py"
-
 
 @dataclass
 class CreateVEnvConfig(DataClassDictMixin):
-    bootstrap_script: str = DEFAULT_BOOTSTRAP_SCRIPT
+    bootstrap_script: str = "bootstrap.py"
+    python_executable: str = "python3"
+    package_manager: Optional[str] = None
 
 
 class CreateVEnv(PipelineStep[ExecutionContext]):
@@ -33,15 +34,16 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
         self.logger.debug(f"Run {self.get_name()} step. Output dir: {self.output_dir}")
         config = CreateVEnvConfig.from_dict(self.config) if self.config else CreateVEnvConfig()
         bootstrap_script = self.project_root_dir / config.bootstrap_script
+        bootstrap_args = []
         if not bootstrap_script.exists():
-            if config.bootstrap_script == DEFAULT_BOOTSTRAP_SCRIPT:
-                raise UserNotificationException(f"Failed to find bootstrap script '{config.bootstrap_script}'. Make sure that the project is initialized correctly.")
-            else:  # Fallback to default bootstrap script
-                bootstrap_script = self.project_root_dir / DEFAULT_BOOTSTRAP_SCRIPT
-                if not bootstrap_script.exists():
-                    raise UserNotificationException("Failed to find bootstrap script. Make sure that the project is initialized correctly.")
+            self.logger.warning(f"Bootstrap script {bootstrap_script} does not exist. Use pypeline internal `bootstrap.py`.")
+            bootstrap_script = get_bootstrap_script()
+            # Only the internal bootstrap.py script supports arguments.
+            bootstrap_args = ["--project-dir", self.project_root_dir.as_posix()]
+            if config.package_manager:
+                bootstrap_args.extend(["--package-manager", f'"{config.package_manager}"'])
         self.execution_context.create_process_executor(
-            ["python3", bootstrap_script.as_posix()],
+            [config.python_executable, bootstrap_script.as_posix(), *bootstrap_args],
             cwd=self.project_root_dir,
         ).execute()
         self.execution_context.add_install_dirs(self.install_dirs)

{pypeline_runner-1.14.0.dist-info → pypeline_runner-1.15.1.dist-info}/METADATA

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

{pypeline_runner-1.14.0.dist-info → pypeline_runner-1.15.1.dist-info}/RECORD

@@ -1,34 +1,32 @@
-pypeline/__init__.py,sha256=oitamisYLp3lrFI3uGv-5ZCJIeYOT9gZLcszUmVNhw8,23
+pypeline/__init__.py,sha256=lJTHPTq_lku8cPevlR7mFSxJNTqHgZJVZuDdqSiDNeM,23
 pypeline/__run.py,sha256=TCdaX05Qm3g8T4QYryKB25Xxf0L5Km7hFOHe1mK9vI0,350
+pypeline/bootstrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pypeline/bootstrap/run.py,sha256=VqBZI9eioGXpWI87GrGrQZaA6Zd-qtf1pi3efyGZezk,20201
 pypeline/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/domain/artifacts.py,sha256=5k7cVfHhLmvWXNuHKxXb9ca4Lxu0JytGQqazENCeKEU,1404
 pypeline/domain/config.py,sha256=6vWdHi7B6MA7NGi9wWXQE-YhSg1COSRmc3b1ji6AdAk,2053
 pypeline/domain/execution_context.py,sha256=cDdUOU32hKg2Mv6FNXCG1co8GUrBf5QOVKhaKO-xVxI,1848
 pypeline/domain/pipeline.py,sha256=2BsN2lw2znUxLH--Novyqe6SubVKs6XeHQSQf9yxirw,7788
 pypeline/domain/project_slurper.py,sha256=64aqgVsrLgAK-c5QOM2N0wGCkOM1uNMio8yKjO2zDLU,1069
-pypeline/inputs_parser.py,sha256=8WJnWbACNmw_iYLhbAwcgGohCZWult8HtiJC9KiG3R0,3389
+pypeline/inputs_parser.py,sha256=tGQRfZMsDAXbir455kxNXPNLN_hwGmSisS41GqYrh1A,3745
 pypeline/kickstart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/kickstart/create.py,sha256=iaB8MMC7PinpPBwRmz3rWZuE-DRbsLh2NtvczYaVgi0,2133
 pypeline/kickstart/templates/project/.gitignore,sha256=y8GJoVvRPez1LBokf1NaDOt2X1XtGwKFMF5yjA8AVS0,24
-pypeline/kickstart/templates/project/bootstrap.ps1,sha256=eR8cyIJwDVt-bA2H3GWmxUew3igJaKYKv4rtg7MqhsY,766
-pypeline/kickstart/templates/project/bootstrap.py,sha256=9cJp_sbU0SKvDjJluvyQfh0_xIsf6E1ct7sa7rRecNU,17244
-pypeline/kickstart/templates/project/poetry.toml,sha256=qgVxBdPcJZOHdHCTOBoZYna3cke4VGgRkNZ0bKgN6rs,32
 pypeline/kickstart/templates/project/pypeline.ps1,sha256=PjCJULG8XA3AHKbNt3oHrIgD04huvvpIue_gjSo3PMA,104
-pypeline/kickstart/templates/project/pypeline.yaml,sha256=dyzn8vmHugpINVyB9l0QujK0J-oi--JQXunjUj9n3_k,385
-pypeline/kickstart/templates/project/pyproject.toml,sha256=A60HZ6Aqf8KTFLoC35SexuJ2Ze1I-khuYmYUKhphfNY,247
-pypeline/kickstart/templates/project/scoopfile.json,sha256=DcfZ8jYf9hmPHM-AWwnPKQJCzRG3fCuYtMeoY01nkag,219
-pypeline/kickstart/templates/project/steps/my_step.py,sha256=iZYTzWtL-qxEW_t7q079d-xpnRST_tumSzxqiQDW7sM,707
+pypeline/kickstart/templates/project/pypeline.yaml,sha256=ZyhMs0o7NRwiOHagePsyC2Sk8Eotzun7QXeyBCrcUdQ,401
+pypeline/kickstart/templates/project/pyproject.toml,sha256=nlsHIbt1XG7sCRwb4W5ePGgxsMm1e_hNACF2LtZ5yAw,271
+pypeline/kickstart/templates/project/steps/my_step.py,sha256=b-JEwF9EyF4G6lgvkk3I2aT2wpD_zQ2fTiQrR6lWhs4,788
 pypeline/kickstart/templates/project/west.yaml,sha256=ZfVym7M4yzzC-Nm0vESdhqNYs6EaJuMQWGJBht_i0b4,188
 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=sajEl43Yqcd1f0BN9lZOhm93UIRXj4Qx4TdAOSxLkTU,2509
+pypeline/steps/create_venv.py,sha256=oNdgBvfYDI0obqgI-I9-vfJYjS6OsDmWOuYq1py9NGk,2488
 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.14.0.dist-info/LICENSE,sha256=sKxdoqSmW9ezvPvt0ZGJbneyA0SBcm0GiqzTv2jN230,1066
-pypeline_runner-1.14.0.dist-info/METADATA,sha256=FgmQ8o6AHWwEtCxGeIYXc5TXxT6KJklRZoIELvMcMTc,7553
-pypeline_runner-1.14.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pypeline_runner-1.14.0.dist-info/entry_points.txt,sha256=pe1u0uuhPI_yeQ0KjEw6jK-EvQfPcZwBSajgbAdKz1o,47
-pypeline_runner-1.14.0.dist-info/RECORD,,
+pypeline_runner-1.15.1.dist-info/LICENSE,sha256=sKxdoqSmW9ezvPvt0ZGJbneyA0SBcm0GiqzTv2jN230,1066
+pypeline_runner-1.15.1.dist-info/METADATA,sha256=7EXTte2u8T8ZQDDOho7VbKAqqvOz7d_zEWsjKOw_b34,7553
+pypeline_runner-1.15.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+pypeline_runner-1.15.1.dist-info/entry_points.txt,sha256=pe1u0uuhPI_yeQ0KjEw6jK-EvQfPcZwBSajgbAdKz1o,47
+pypeline_runner-1.15.1.dist-info/RECORD,,

pypeline/kickstart/templates/project/bootstrap.ps1

@@ -1,31 +0,0 @@
-<#
-.DESCRIPTION
-    Wrapper for installing dependencies
-#>
-
-function Invoke-Bootstrap {
-    # Download bootstrap scripts from external repository
-    Invoke-RestMethod https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.15.1/install.ps1 | Invoke-Expression
-    # Execute bootstrap script
-    . .\.bootstrap\bootstrap.ps1
-}
-
-## start of script
-# Always set the $InformationPreference variable to "Continue" globally,
-# this way it gets printed on execution and continues execution afterwards.
-$InformationPreference = "Continue"
-
-# Stop on first error
-$ErrorActionPreference = "Stop"
-
-Push-Location $PSScriptRoot
-Write-Output "Running in ${pwd}"
-
-try {
-    # bootstrap environment
-    Invoke-Bootstrap
-}
-finally {
-    Pop-Location
-}
-## end of script

pypeline/kickstart/templates/project/poetry.toml

@@ -1,2 +0,0 @@
-[virtualenvs]
-in-project = true

pypeline/kickstart/templates/project/scoopfile.json

@@ -1,14 +0,0 @@
-{
-  "buckets": [
-    {
-      "Name": "versions",
-      "Source": "https://github.com/ScoopInstaller/Versions"
-    }
-  ],
-  "apps": [
-    {
-      "Source": "versions",
-      "Name": "mingw-winlibs-llvm-ucrt"
-    }
-  ]
-}