Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [3.1.0rc1] - 2026-08-04
## [3.1.0rc2] - 2026-10-01

### Added

Expand Down Expand Up @@ -158,8 +158,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Convert Ewoks `Graph` to graph of actors for exection.

[unreleased]: https://github.com/ewoks-kit/ewoksppf/compare/v3.1.0rc1...HEAD
[3.1.0rc1]: https://github.com/ewoks-kit/ewoksppf/compare/v3.0.0...v3.1.0rc1
[unreleased]: https://github.com/ewoks-kit/ewoksppf/compare/v3.1.0rc2...HEAD
[3.1.0rc2]: https://github.com/ewoks-kit/ewoksppf/compare/v3.0.0...v3.1.0rc2
[3.0.0]: https://github.com/ewoks-kit/ewoksppf/compare/v2.0.2...v3.0.0
[2.0.2]: https://github.com/ewoks-kit/ewoksppf/compare/v2.0.1...v2.0.2
[2.0.1]: https://github.com/ewoks-kit/ewoksppf/compare/v2.0.0...v2.0.1
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "ewoksppf"
version = "3.1.0rc1"
version = "3.1.0rc2"
authors = [{ name = "ESRF", email = "dau-pydev@esrf.fr" }]
description = "Pypushflow binding for Ewoks"
readme = { file = "README.md", content-type = "text/markdown" }
Expand Down
14 changes: 12 additions & 2 deletions src/ewoksppf/tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
from ewokscore.tests.examples.graphs import get_graph
from ewokscore.tests.examples.graphs import graph_names
from ewokscore.tests.utils.results import assert_execute_graph_default_result
from pypushflow.concurrent.factory import get_pool
from pypushflow.concurrent.factory import get_pool_types


def _graph_name_param(name):
Expand All @@ -18,18 +20,26 @@ def _graph_name_param(name):

@pytest.mark.parametrize("graph_name", [_graph_name_param(n) for n in graph_names()])
@pytest.mark.parametrize("scheme", (None, "json"))
def test_execute_graph(engine, graph_name, scheme, ppf_log_config, tmpdir):
@pytest.mark.parametrize("pool_type", get_pool_types())
def test_execute_graph(engine, graph_name, scheme, pool_type, ppf_log_config, tmpdir):
if graph_name == "self_trigger":
pytest.skip(
"Self-triggering workflow execution is inconsistent: https://github.com/ewoks-kit/ewoksppf/issues/16"
)

try:
get_pool(pool_type)
except ImportError as e:
pytest.skip(str(e))

graph, expected = get_graph(graph_name)
if scheme:
varinfo = {"root_uri": str(tmpdir), "scheme": scheme}
else:
varinfo = None

ewoksgraph = load_graph(graph)
result = engine.execute_graph(graph, varinfo=varinfo, timeout=10)
result = engine.execute_graph(
graph, varinfo=varinfo, timeout=10, pool_type=pool_type
)
assert_execute_graph_default_result(ewoksgraph, result, expected, varinfo)
Loading