Skip to content

Commit 0f1cb94

Browse files
committed
nextflow support improvments
1 parent fc9de8e commit 0f1cb94

10 files changed

Lines changed: 26 additions & 134 deletions

File tree

docs/source/dev_api_wfbench.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ wfcommons.wfbench.bench
1515
:noindex:
1616

1717
wfcommons.wfbench.translator.nextflow
18-
------------------------------------
18+
-------------------------------------
1919

2020
.. automodule:: wfcommons.wfbench.translator.nextflow
2121
:members:

docs/source/generating_workflows.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ synthetic workflow instances. The current list of available workflow recipes inc
2525
- :class:`~wfcommons.wfchef.recipes.epigenomics.recipe.EpigenomicsRecipe`: :code:`from wfcommons.wfchef.recipes import EpigenomicsRecipe`
2626
- :class:`~wfcommons.wfchef.recipes.genome.recipe.GenomeRecipe`: :code:`from wfcommons.wfchef.recipes import GenomeRecipe`
2727
- :class:`~wfcommons.wfchef.recipes.montage.recipe.MontageRecipe`: :code:`from wfcommons.wfchef.recipes import MontageRecipe`
28+
- :class:`~wfcommons.wfchef.recipes.rnaseq.recipe.RnaseqRecipe`: :code:`from wfcommons.wfchef.recipes import RnaseqRecipe`
2829
- :class:`~wfcommons.wfchef.recipes.seismology.recipe.SeismologyRecipe`: :code:`from wfcommons.wfchef.recipes import SeismologyRecipe`
2930
- :class:`~wfcommons.wfchef.recipes.soykb.recipe.SoykbRecipe`: :code:`from wfcommons.wfchef.recipes import SoykbRecipe`
3031
- :class:`~wfcommons.wfchef.recipes.srasearch.recipe.SrasearchRecipe`: :code:`from wfcommons.wfchef.recipes import SrasearchRecipe`

docs/source/parsing_logs.rst

Lines changed: 0 additions & 118 deletions
This file was deleted.

docs/source/user_api_wfchef.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ wfcommons.wfchef.recipes.montage.recipe
5454
:undoc-members:
5555
:show-inheritance:
5656

57+
wfcommons.wfchef.recipes.rnaseq.recipe
58+
--------------------------------------
59+
60+
.. automodule:: wfcommons.wfchef.recipes.rnaseq.recipe
61+
:members:
62+
:undoc-members:
63+
:show-inheritance:
64+
5765
wfcommons.wfchef.recipes.seismology.recipe
5866
------------------------------------------
5967

tests/unit/common/test_task.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33
#
4-
# Copyright (c) 2024 The WfCommons Team.
4+
# Copyright (c) 2024-2025 The WfCommons Team.
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ def task(self) -> Task:
4141
energy=100,
4242
avg_power=1.0,
4343
priority=100,
44-
executedAt="2024-09-15T08:59:33.699321-04:00",
44+
executed_at="2024-09-15T08:59:33.699321-04:00",
4545
task_type=TaskType.COMPUTE,
4646
launch_dir="/tmp",
4747
)

tests/unit/common/test_workflow.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33
#
4-
# Copyright (c) 2024 The WfCommons Team.
4+
# Copyright (c) 2024-2025 The WfCommons Team.
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
@@ -11,6 +11,7 @@
1111
import pathlib
1212
import pytest
1313

14+
from datetime import datetime
1415
from wfcommons.common import Task, Workflow
1516
from wfcommons.version import __version__, __schema_version__
1617

@@ -28,7 +29,8 @@ class TestWorkflow:
2829
def workflow(self) -> Workflow:
2930
return Workflow(
3031
name="Workflow Test",
31-
makespan=100.0
32+
makespan=100.0,
33+
executed_at=str(datetime.now().astimezone().isoformat())
3234
)
3335

3436
@pytest.mark.unit

wfcommons/common/task.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33
#
4-
# Copyright (c) 2020-2023 The WfCommons Team.
4+
# Copyright (c) 2020-2025 The WfCommons Team.
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by

wfcommons/common/workflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def __init__(self,
8484
self.tasks_children = {}
8585
self.workflow_id: str = None
8686
self.workflow_json = {}
87-
super().__init__(name=name, makespan=self.makespan, executedat=self.executed_at)
87+
super().__init__(name=name, makespan=self.makespan, executed_at=self.executed_at)
8888

8989
def add_task(self, task: Task) -> None:
9090
"""

wfcommons/wfchef/chef.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33
#
4-
# Copyright (c) 2021 The WfCommons Team.
4+
# Copyright (c) 2021-2025 The WfCommons Team.
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
@@ -230,7 +230,7 @@ def create_recipe(path_to_instances: Union[str, pathlib.Path],
230230
:param verbose: when set, prints status messages.
231231
:type cutoff: bool
232232
:param verbose: number of times to repeat the err calculation process (due to randomization).
233-
:type runs:bool
233+
:type runs: bool
234234
"""
235235
camelname = capitalcase(wf_name)
236236
savedir.mkdir(exist_ok=True, parents=True)
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33
#
4-
# Copyright (c) 2021 The WfCommons Team.
4+
# Copyright (c) 2021-2025 The WfCommons Team.
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
88
# the Free Software Foundation, either version 3 of the License, or
99
# (at your option) any later version.
1010

11+
from .blast import BlastRecipe
12+
from .bwa import BwaRecipe
13+
from .cycles import CyclesRecipe
1114
from .epigenomics import EpigenomicsRecipe
15+
from .genome import GenomeRecipe
1216
from .montage import MontageRecipe
13-
from .cycles import CyclesRecipe
17+
from .rnaseq import RnaseqRecipe
1418
from .seismology import SeismologyRecipe
1519
from .soykb import SoykbRecipe
1620
from .srasearch import SrasearchRecipe
17-
18-
from .genome import GenomeRecipe
19-
from .blast import BlastRecipe
20-
from .bwa import BwaRecipe
21-
from .rnaseq import RnaseqRecipe

0 commit comments

Comments
 (0)