From 3b87663c2eb1ee6473058056c93a12f1481b3911 Mon Sep 17 00:00:00 2001
From: Julian Geiger <julian.geiger@psi.ch>
Date: Mon, 16 Dec 2024 12:57:37 +0100
Subject: [PATCH] Fix merge

---
 src/sirocco/core/_tasks/shell_task.py     | 1 -
 src/sirocco/parsing/_yaml_data_models.py  | 7 ++-----
 tests/files/configs/test_config_large.yml | 6 +++---
 tests/run-example.py                      | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/sirocco/core/_tasks/shell_task.py b/src/sirocco/core/_tasks/shell_task.py
index 3e018495..d163e597 100644
--- a/src/sirocco/core/_tasks/shell_task.py
+++ b/src/sirocco/core/_tasks/shell_task.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from pathlib import Path
 from dataclasses import dataclass
 
 from sirocco.core.graph_items import Task
diff --git a/src/sirocco/parsing/_yaml_data_models.py b/src/sirocco/parsing/_yaml_data_models.py
index 983bd203..6a51fa8b 100644
--- a/src/sirocco/parsing/_yaml_data_models.py
+++ b/src/sirocco/parsing/_yaml_data_models.py
@@ -8,12 +8,9 @@
 
 from isoduration import parse_duration
 from isoduration.types import Duration  # pydantic needs type # noqa: TCH002
-from pydantic import BaseModel, ConfigDict, Discriminator, Discriminator, Field, Tag, Tag, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Discriminator, Field, Tag, field_validator, model_validator
 
-from sirocco.core._tasks.icon_task import IconTask
-from sirocco.core._tasks.shell_task import ShellTask
-from sirocco.core.graph_items import Task
-from sirocco.parsingsirocco.parsing._utils import TimeUtils
+from sirocco.parsing._utils import TimeUtils
 
 
 class _NamedBaseModel(BaseModel):
diff --git a/tests/files/configs/test_config_large.yml b/tests/files/configs/test_config_large.yml
index 02f4c465..f0fd3bd8 100644
--- a/tests/files/configs/test_config_large.yml
+++ b/tests/files/configs/test_config_large.yml
@@ -44,9 +44,6 @@ cycles:
             inputs:
               - stream_2:
                   lag: ['P0M', 'P2M', 'P4M', 'P6M', 'P8M', 'P10M']
-                  # `arg_option` should be in `tasks` section instead
-                  # How to implement this? Even needed with keyword-arguments?
-                  arg_option: --input
             outputs: [postout_2]
         - store_and_clean_2:
             inputs:
@@ -121,6 +118,9 @@ tasks:
       cli_arguments:
         keyword:
           --input: stream_2
+          # `arg_option` should be in `tasks` section instead
+          # How to implement this? Even needed with keyword-arguments?
+          arg_option: --input
       nodes: 2
       walltime: 00:05:00
       src: path/to/src/dir
diff --git a/tests/run-example.py b/tests/run-example.py
index 24f785ea..bf3fd27b 100644
--- a/tests/run-example.py
+++ b/tests/run-example.py
@@ -22,4 +22,4 @@
 pprint(wf_from_yaml)
 
 # test_str = PrettyPrinter.format(wf_from_yaml)
-# pprint(test_str)
\ No newline at end of file
+# pprint(test_str)