pypeline-runner 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

pypeline/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.3.0"

pypeline/domain/pipeline.py

@@ -5,12 +5,15 @@ from typing import (
     Any,
     Dict,
     Generic,
+    Iterator,
     List,
     Optional,
     OrderedDict,
+    Tuple,
     Type,
     TypeAlias,
     TypeVar,
+    Union,
 )
 
 from mashumaro import DataClassDictMixin
@@ -39,7 +42,27 @@ class PipelineStepConfig(DataClassDictMixin):
     config: Optional[Dict[str, Any]] = None
 
 
-PipelineConfig: TypeAlias = OrderedDict[str, List[PipelineStepConfig]]
+PipelineConfig: TypeAlias = Union[List[PipelineStepConfig], OrderedDict[str, List[PipelineStepConfig]]]
+
+
+class PipelineConfigIterator:
+    """
+    Iterates over the pipeline configuration, yielding group name and steps configuration.
+
+    This class abstracts the iteration logic for PipelineConfig, which can be:
+    - A list of steps (group name is None)
+    - An OrderedDict with group names as keys and lists of steps as values.
+
+    The iterator yields tuples of (group_name, steps).
+    """
+
+    def __init__(self, pipeline_config: PipelineConfig) -> None:
+        self._items = pipeline_config.items() if isinstance(pipeline_config, OrderedDict) else [(None, pipeline_config)]
+
+    def __iter__(self) -> Iterator[Tuple[Optional[str], List[PipelineStepConfig]]]:
+        """Return an iterator."""
+        yield from self._items
+
 
 TExecutionContext = TypeVar("TExecutionContext", bound=ExecutionContext)
 
@@ -47,7 +70,7 @@ TExecutionContext = TypeVar("TExecutionContext", bound=ExecutionContext)
 class PipelineStep(Generic[TExecutionContext], Runnable):
     """One can create subclasses of PipelineStep that specify the type of ExecutionContext they require."""
 
-    def __init__(self, execution_context: TExecutionContext, group_name: str, config: Optional[Dict[str, Any]] = None) -> None:
+    def __init__(self, execution_context: TExecutionContext, group_name: Optional[str], config: Optional[Dict[str, Any]] = None) -> None:
         super().__init__(self.get_needs_dependency_management())
         self.execution_context = execution_context
         self.group_name = group_name
@@ -56,7 +79,10 @@ class PipelineStep(Generic[TExecutionContext], Runnable):
 
     @property
     def output_dir(self) -> Path:
-        return self.execution_context.create_artifacts_locator().build_dir.joinpath(self.group_name)
+        output_dir = self.execution_context.create_artifacts_locator().build_dir
+        if self.group_name:
+            output_dir = output_dir / self.group_name
+        return output_dir
 
     @abstractmethod
     def update_execution_context(self) -> None:
@@ -73,7 +99,7 @@ class PipelineStep(Generic[TExecutionContext], Runnable):
 
 
 class PipelineStepReference(Generic[TExecutionContext]):
-    def __init__(self, group_name: str, _class: Type[PipelineStep[TExecutionContext]], config: Optional[Dict[str, Any]] = None) -> None:
+    def __init__(self, group_name: Optional[str], _class: Type[PipelineStep[TExecutionContext]], config: Optional[Dict[str, Any]] = None) -> None:
         self.group_name = group_name
         self._class = _class
         self.config = config

pypeline/kickstart/templates/project/bootstrap.ps1

@@ -5,7 +5,7 @@
 
 function Invoke-Bootstrap {
     # Download bootstrap scripts from external repository
-    Invoke-RestMethod https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.15.0/install.ps1 | Invoke-Expression
+    Invoke-RestMethod https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.15.1/install.ps1 | Invoke-Expression
     # Execute bootstrap script
     . .\.bootstrap\bootstrap.ps1
 }

pypeline/kickstart/templates/project/pypeline.ps1

@@ -1 +1,7 @@
-.\.venv\Scripts\pypeline.exe $args
+Push-Location $PSScriptRoot
+try {
+    .\.venv\Scripts\pypeline.exe $args
+}
+finally {
+    Pop-Location
+}

pypeline/kickstart/templates/project/pypeline.yaml

@@ -1,12 +1,9 @@
 pipeline:
-  venv:
-    - step: CreateVEnv
-      module: pypeline.steps.create_venv
-      config:
-        bootstrap_script: .bootstrap/bootstrap.py
-  install:
-    - step: ScoopInstall
-      module: pypeline.steps.scoop_install
-  custom:
-    - step: MyStep
-      file: steps/my_step.py
+  - step: CreateVEnv
+    module: pypeline.steps.create_venv
+    config:
+      bootstrap_script: .bootstrap/bootstrap.py
+  - step: ScoopInstall
+    module: pypeline.steps.scoop_install
+  - step: MyStep
+    file: steps/my_step.py

pypeline/main.py

@@ -8,6 +8,7 @@ from py_app_dev.core.logging import logger, setup_logger, time_it
 
 from pypeline import __version__
 from pypeline.domain.execution_context import ExecutionContext
+from pypeline.domain.pipeline import PipelineConfigIterator
 from pypeline.domain.project_slurper import ProjectSlurper
 from pypeline.kickstart.create import KickstartProject
 from pypeline.pypeline import PipelineScheduler, PipelineStepsExecutor
@@ -69,8 +70,9 @@ def run(
     project_slurper = ProjectSlurper(project_dir)
     if print:
         logger.info("Pipeline steps:")
-        for group, step_configs in project_slurper.pipeline.items():
-            logger.info(f"    Group: {group}")
+        for group, step_configs in PipelineConfigIterator(project_slurper.pipeline):
+            if group:
+                logger.info(f"    Group: {group}")
             for step_config in step_configs:
                 logger.info(f"        {step_config.step}")
         return

pypeline/pypeline.py

@@ -17,7 +17,7 @@ from py_app_dev.core.runnable import Executor
 
 from .domain.artifacts import ProjectArtifactsLocator
 from .domain.execution_context import ExecutionContext
-from .domain.pipeline import PipelineConfig, PipelineStep, PipelineStepConfig, PipelineStepReference, TExecutionContext
+from .domain.pipeline import PipelineConfig, PipelineConfigIterator, PipelineStep, PipelineStepConfig, PipelineStepReference, TExecutionContext
 
 
 class PipelineLoader(Generic[TExecutionContext]):
@@ -35,13 +35,13 @@ class PipelineLoader(Generic[TExecutionContext]):
 
     def load_steps_references(self) -> List[PipelineStepReference[TExecutionContext]]:
         result = []
-        for group_name, steps_config in self.pipeline_config.items():
+        for group_name, steps_config in PipelineConfigIterator(self.pipeline_config):
             result.extend(self._load_steps(group_name, steps_config, self.project_root_dir))
         return result
 
     @staticmethod
     def _load_steps(
-        group_name: str,
+        group_name: Optional[str],
         steps_config: List[PipelineStepConfig],
         project_root_dir: Path,
     ) -> List[PipelineStepReference[TExecutionContext]]:

pypeline/steps/create_venv.py

@@ -19,7 +19,6 @@ class CreateVEnv(PipelineStep[ExecutionContext]):
     def __init__(self, execution_context: ExecutionContext, group_name: str, config: Optional[Dict[str, Any]] = None) -> None:
         super().__init__(execution_context, group_name, config)
         self.logger = logger.bind()
-        self.logger = logger.bind()
 
     @property
     def install_dirs(self) -> List[Path]:

{pypeline_runner-1.1.0.dist-info → pypeline_runner-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypeline-runner
-Version: 1.1.0
+Version: 1.3.0
 Summary: Configure and execute pipelines with Python (similar to GitHub workflows or Jenkins pipelines).
 Home-page: https://github.com/cuinixam/pypeline
 License: MIT
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
-Requires-Dist: py-app-dev (>=2.2,<3.0)
+Requires-Dist: py-app-dev (>=2.3.3,<3.0.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)
 Requires-Dist: typer[all] (>=0.12,<0.13)
 Project-URL: Bug Tracker, https://github.com/cuinixam/pypeline/issues

{pypeline_runner-1.1.0.dist-info → pypeline_runner-1.3.0.dist-info}/RECORD

@@ -1,30 +1,30 @@
-pypeline/__init__.py,sha256=LGVQyDsWifdACo7qztwb8RWWHds1E7uQ-ZqD8SAjyw4,22
+pypeline/__init__.py,sha256=F5mW07pSyGrqDNY2Ehr-UpDzpBtN-FsYU0QGZWf6PJE,22
 pypeline/__run.py,sha256=TCdaX05Qm3g8T4QYryKB25Xxf0L5Km7hFOHe1mK9vI0,350
 pypeline/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/domain/artifacts.py,sha256=qXshnk9umi0AVGV4m5iEiy_MQ5Ad2LDZwI8OULU-qMk,1355
 pypeline/domain/config.py,sha256=AlavAaz5hSxa6yaKYnj-x71ClhOtA41yv5Qf2JIE47k,1650
 pypeline/domain/execution_context.py,sha256=0zc3OgXeIMDpgWWYMaDGub7fY5urLLR79yuCaXVxoTQ,1101
-pypeline/domain/pipeline.py,sha256=PlNrRXBaLw3Eu62ytyH3sgbTmt5pKXC4l24GXXhCNII,2925
+pypeline/domain/pipeline.py,sha256=1xhIl1zFr6r8mGeQWn04P2_N5smTu-eyY_6irNZNpWk,3860
 pypeline/domain/project_slurper.py,sha256=YCho7V1BHjFmC_foxHFaWX8c_VbMJ16XEB4CQBlMrhc,894
 pypeline/kickstart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypeline/kickstart/create.py,sha256=dWqSdDsqNh7_AnNEsJzsmheR2-xyO6rpUwF-7AwzCYY,2188
 pypeline/kickstart/templates/project/.gitignore,sha256=y8GJoVvRPez1LBokf1NaDOt2X1XtGwKFMF5yjA8AVS0,24
-pypeline/kickstart/templates/project/bootstrap.ps1,sha256=QaK0UmU7DSJdekiSUM9CAX87y0BbcrizrJ0T43Fdom8,766
+pypeline/kickstart/templates/project/bootstrap.ps1,sha256=eR8cyIJwDVt-bA2H3GWmxUew3igJaKYKv4rtg7MqhsY,766
 pypeline/kickstart/templates/project/poetry.toml,sha256=q5gF2MWexTFIahJ6StUa3y62HDUrRW7t8kGFszZhgp4,34
-pypeline/kickstart/templates/project/pypeline.ps1,sha256=tkiXrsMsNM43WJdmWJRhis3TIjwAVUjO2xAP9sT31Fo,36
-pypeline/kickstart/templates/project/pypeline.yaml,sha256=RViO09RQsd-jHIwqY80EJFCSipM3pEK-laKjY0nZIYc,283
+pypeline/kickstart/templates/project/pypeline.ps1,sha256=s7CDfnagg8BIO42fpCfLF1l8uK7PNzui-7t9_suokzc,111
+pypeline/kickstart/templates/project/pypeline.yaml,sha256=EV5Tnu3H33gMT3Ov0t14-jKwnv9naSMb0wEDzaG0H2Q,238
 pypeline/kickstart/templates/project/pyproject.toml,sha256=yc6RCo-bUo1PXF91XfM-dButgfxU16Uud34NidgJ0zQ,225
 pypeline/kickstart/templates/project/scoopfile.json,sha256=DcfZ8jYf9hmPHM-AWwnPKQJCzRG3fCuYtMeoY01nkag,219
 pypeline/kickstart/templates/project/steps/my_step.py,sha256=_zx01qAVuwn6IMPBUBwKY-IBjS9Gs2m-d51L9sayGug,733
-pypeline/main.py,sha256=20gfpGlYWN3wlAifTkES4VY3lXDQjwKBYd8KkSr33EE,3355
+pypeline/main.py,sha256=GtuOgB9OeNFgbWLHZux80fppYQVwMYNFZoZhDIlJW9c,3457
 pypeline/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypeline/pypeline.py,sha256=GUEIPtK6TU9yt-izuIqbRUjbxM3JASoj8nNJ63mN388,8756
+pypeline/pypeline.py,sha256=GC4AS8rGKdJJVSNXfxV3-0F94-Rgt-Soth6rl_gZuW8,8806
 pypeline/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pypeline/steps/create_venv.py,sha256=hXRklcYR38uUPWRDyhUjWu8WEPIaQPSQggM_ocwG7k8,1971
+pypeline/steps/create_venv.py,sha256=vTPSA0gGGzq_QhI1jAgsGchS2s8_ZpEtnWcb0uL8BHE,1934
 pypeline/steps/scoop_install.py,sha256=_YdoCMXLON0eIwck8PJOcNhayx_ka1krBAidw_oRuFE,3373
 pypeline/steps/west_install.py,sha256=hPyr28ksdKsQ0tv0gMNytzupgk1IgjN9CpmaBdX5zps,1947
-pypeline_runner-1.1.0.dist-info/LICENSE,sha256=sKxdoqSmW9ezvPvt0ZGJbneyA0SBcm0GiqzTv2jN230,1066
-pypeline_runner-1.1.0.dist-info/METADATA,sha256=vjFtXYVItC-mrgTRoM87wGRadb-5e7Z5Trj7bbF-M7A,7207
-pypeline_runner-1.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pypeline_runner-1.1.0.dist-info/entry_points.txt,sha256=pe1u0uuhPI_yeQ0KjEw6jK-EvQfPcZwBSajgbAdKz1o,47
-pypeline_runner-1.1.0.dist-info/RECORD,,
+pypeline_runner-1.3.0.dist-info/LICENSE,sha256=sKxdoqSmW9ezvPvt0ZGJbneyA0SBcm0GiqzTv2jN230,1066
+pypeline_runner-1.3.0.dist-info/METADATA,sha256=vFgk-TdAPHnMIP4gabBdE_nevAscPi4Vvrl_H6xVhpM,7211
+pypeline_runner-1.3.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pypeline_runner-1.3.0.dist-info/entry_points.txt,sha256=pe1u0uuhPI_yeQ0KjEw6jK-EvQfPcZwBSajgbAdKz1o,47
+pypeline_runner-1.3.0.dist-info/RECORD,,