pypeline-runner 1.8.1__tar.gz → 1.9.1__tar.gz

{pypeline_runner-1.8.1 → pypeline_runner-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypeline-runner
-Version: 1.8.1
+Version: 1.9.1
 Summary: Configure and execute pipelines with Python (similar to GitHub workflows or Jenkins pipelines).
 License: MIT
 Author: cuinixam
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: py-app-dev (>=2.5,<3.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)
-Requires-Dist: typer (>=0.12,<0.13)
+Requires-Dist: typer (>=0,<1)
 Project-URL: Bug Tracker, https://github.com/cuinixam/pypeline/issues
 Project-URL: Changelog, https://github.com/cuinixam/pypeline/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://pypeline-runner.readthedocs.io

{pypeline_runner-1.8.1 → pypeline_runner-1.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pypeline-runner"
-version = "1.8.1"
+version = "1.9.1"
 description = "Configure and execute pipelines with Python (similar to GitHub workflows or Jenkins pipelines)."
 authors = ["cuinixam <me@cuinixam.com>"]
 license = "MIT"
@@ -28,7 +28,7 @@ pypeline = "pypeline.main:main"
 [tool.poetry.dependencies]
 python = "^3.10"
 py-app-dev = "^2.5"
-typer = "^0.12"
+typer = "^0"
 pyyaml = "^6.0"
 
 [tool.poetry.group.dev.dependencies]

pypeline_runner-1.9.1/src/pypeline/__init__.py

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

{pypeline_runner-1.8.1 → pypeline_runner-1.9.1}/src/pypeline/kickstart/templates/project/pyproject.toml

@@ -6,6 +6,6 @@ authors = ["Your Name"]
 package-mode = false
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.13"
+python = ">=3.10,<4.0"
 pypeline-runner = "*"
 west = "*"

{pypeline_runner-1.8.1 → pypeline_runner-1.9.1}/src/pypeline/main.py

@@ -1,6 +1,6 @@
 import sys
 from pathlib import Path
-from typing import Optional
+from typing import List, Optional
 
 import typer
 from py_app_dev.core.exceptions import UserNotificationException
@@ -43,30 +43,11 @@ def init(
 def run(
     project_dir: Path = typer.Option(Path.cwd().absolute(), help="The project directory"),  # noqa: B008,
     config_file: Optional[str] = typer.Option(None, help="The name of the YAML configuration file containing the pypeline definition."),
-    step: Optional[str] = typer.Option(
-        None,
-        help="Name of the step to run (as written in the pipeline config).",
-    ),
-    single: bool = typer.Option(
-        False,
-        help="If provided, only the provided step will run, without running all previous steps in the pipeline.",
-        is_flag=True,
-    ),
-    print: bool = typer.Option(
-        False,
-        help="Print the pipeline steps.",
-        is_flag=True,
-    ),
-    force_run: bool = typer.Option(
-        False,
-        help="Force the execution of a step even if it is not dirty.",
-        is_flag=True,
-    ),
-    dry_run: bool = typer.Option(
-        False,
-        help="Do not run any step, just print the steps that would be executed.",
-        is_flag=True,
-    ),
+    step: Optional[List[str]] = typer.Option(None, help="Name of the step to run (as written in the pipeline config)."),  # noqa: B008
+    single: bool = typer.Option(False, help="If provided, only the provided step will run, without running all previous steps in the pipeline."),
+    print: bool = typer.Option(False, help="Print the pipeline steps."),
+    force_run: bool = typer.Option(False, help="Force the execution of a step even if it is not dirty."),
+    dry_run: bool = typer.Option(False, help="Do not run any step, just print the steps that would be executed."),
 ) -> None:
     project_slurper = ProjectSlurper(project_dir, config_file)
     if print:
@@ -82,8 +63,6 @@ def run(
     # Schedule the steps to run
     steps_references = PipelineScheduler[ExecutionContext](project_slurper.pipeline, project_dir).get_steps_to_run(step, single)
     if not steps_references:
-        if step:
-            raise UserNotificationException(f"Step '{step}' not found in the pipeline.")
         logger.info("No steps to run.")
         return
 

{pypeline_runner-1.8.1 → pypeline_runner-1.9.1}/src/pypeline/pypeline.py

@@ -115,23 +115,45 @@ class PipelineScheduler(Generic[TExecutionContext]):
         self.project_root_dir = project_root_dir
         self.logger = logger.bind()
 
-    def get_steps_to_run(self, step_name: Optional[str] = None, single: bool = False) -> List[PipelineStepReference[PipelineStep[TExecutionContext]]]:
-        return self.filter_steps_references(self.create_pipeline_loader(self.pipeline, self.project_root_dir).load_steps_references(), step_name, single)
+    def get_steps_to_run(self, step_names: Optional[List[str]] = None, single: bool = False) -> List[PipelineStepReference[PipelineStep[TExecutionContext]]]:
+        return self.filter_steps_references(self.create_pipeline_loader(self.pipeline, self.project_root_dir).load_steps_references(), step_names, single)
 
     @staticmethod
     def filter_steps_references(
         steps_references: List[PipelineStepReference[PipelineStep[TExecutionContext]]],
-        step_name: Optional[str],
+        step_names: Optional[List[str]],
         single: Optional[bool],
     ) -> List[PipelineStepReference[PipelineStep[TExecutionContext]]]:
-        if step_name:
-            step_reference = next((step for step in steps_references if step.name == step_name), None)
-            if not step_reference:
-                return []
-            if single:
-                return [step_reference]
-            return [step for step in steps_references if steps_references.index(step) <= steps_references.index(step_reference)]
-        return steps_references
+        if not step_names:
+            return steps_references
+
+        step_names_set = set(step_names)
+        filtered_steps = []
+        found_steps = set()
+
+        if single:
+            # Include only the explicitly named steps, preserving order
+            filtered_steps = [step for step in steps_references if step.name in step_names_set]
+            found_steps = {step.name for step in filtered_steps}
+        else:
+            # Include all steps until the last explicitly named step is found
+            for step in steps_references:
+                filtered_steps.append(step)
+                if step.name in step_names_set:
+                    found_steps.add(step.name)
+                    if found_steps == step_names_set:
+                        # Once all named steps have been found, stop here
+                        break
+            else:
+                # If loop completes without finding all named steps
+                missing_steps = step_names_set - found_steps
+                raise UserNotificationException(f"Steps not found in pipeline configuration: {', '.join(missing_steps)}")
+
+        missing_steps = step_names_set - found_steps
+        if missing_steps:
+            raise UserNotificationException(f"Steps not found in pipeline configuration: {', '.join(missing_steps)}")
+
+        return filtered_steps
 
     @staticmethod
     def create_pipeline_loader(pipeline: PipelineConfig, project_root_dir: Path) -> PipelineLoader[PipelineStep[TExecutionContext]]:

pypeline_runner-1.8.1/src/pypeline/__init__.py

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