Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
GeigerJ2 committed Dec 16, 2024
1 parent 5d8ee70 commit 3b87663
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
1 change: 0 additions & 1 deletion src/sirocco/core/_tasks/shell_task.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from __future__ import annotations

from pathlib import Path
from dataclasses import dataclass

from sirocco.core.graph_items import Task
Expand Down
7 changes: 2 additions & 5 deletions src/sirocco/parsing/_yaml_data_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions tests/files/configs/test_config_large.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/run-example.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
pprint(wf_from_yaml)

# test_str = PrettyPrinter.format(wf_from_yaml)
# pprint(test_str)
# pprint(test_str)

0 comments on commit 3b87663

Please sign in to comment.