From 99336c793b3948373c2f3c0881d4631a06021a97 Mon Sep 17 00:00:00 2001 From: ZdenekM Date: Wed, 19 Jun 2024 13:19:12 +0200 Subject: [PATCH] fix(arcor2_execution): wrong order of functions --- README.md | 2 +- compose-files/fit-demo/docker-compose.yml | 2 +- src/docker/arcor2_execution/BUILD | 2 +- src/python/arcor2_execution/CHANGELOG.md | 6 ++++++ src/python/arcor2_execution/VERSION | 2 +- src/python/arcor2_runtime/action.py | 14 +++++++------- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5772817b..ab30002a 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ The following video by [Kinali](https://www.kinali.cz/en/) shows the use case (o [README](src/python/arcor2_execution/README.md) | [CHANGELOG](src/python/arcor2_execution/CHANGELOG.md) - - 2024-06-14: [1.4.0](https://github.com/robofit/arcor2/releases/tag/arcor2_execution%2F1.4.0) ([docker](https://hub.docker.com/r/arcor2/arcor2_execution/tags?page=1&ordering=last_updated&name=1.4.0), [pypi](https://pypi.org/project/arcor2-execution/1.4.0/)). + - 2024-06-19: [1.4.1](https://github.com/robofit/arcor2/releases/tag/arcor2_execution%2F1.4.1) ([docker](https://hub.docker.com/r/arcor2/arcor2_execution/tags?page=1&ordering=last_updated&name=1.4.1), [pypi](https://pypi.org/project/arcor2-execution/1.4.1/)). ### arcor2_execution_data diff --git a/compose-files/fit-demo/docker-compose.yml b/compose-files/fit-demo/docker-compose.yml index 4500bd68..1b892a17 100644 --- a/compose-files/fit-demo/docker-compose.yml +++ b/compose-files/fit-demo/docker-compose.yml @@ -61,7 +61,7 @@ services: - fit-demo-project-network fit-demo-execution: - image: arcor2/arcor2_execution:1.4.0 + image: arcor2/arcor2_execution:1.4.1 container_name: fit-demo-execution networks: - fit-demo-execution-network diff --git a/src/docker/arcor2_execution/BUILD b/src/docker/arcor2_execution/BUILD index fda5781e..980cb275 100644 --- a/src/docker/arcor2_execution/BUILD +++ b/src/docker/arcor2_execution/BUILD @@ -1 +1 @@ -docker_image(name="arcor2_execution", repository="arcor2/arcor2_execution", image_tags=["1.4.0"]) +docker_image(name="arcor2_execution", repository="arcor2/arcor2_execution", image_tags=["1.4.1"]) diff --git a/src/python/arcor2_execution/CHANGELOG.md b/src/python/arcor2_execution/CHANGELOG.md index 410c00b3..d58284d2 100644 --- a/src/python/arcor2_execution/CHANGELOG.md +++ b/src/python/arcor2_execution/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +## [1.4.1] - 2024-06-19 + +### Fixed + +- Attempt to run package resulted into `NameError` in some environments (and was OK on others, weird). + ## [1.4.0] - 2024-06-14 ### Changed diff --git a/src/python/arcor2_execution/VERSION b/src/python/arcor2_execution/VERSION index e21e727f..13175fdc 100644 --- a/src/python/arcor2_execution/VERSION +++ b/src/python/arcor2_execution/VERSION @@ -1 +1 @@ -1.4.0 \ No newline at end of file +1.4.1 \ No newline at end of file diff --git a/src/python/arcor2_runtime/action.py b/src/python/arcor2_runtime/action.py index 29840c1a..64cba145 100644 --- a/src/python/arcor2_runtime/action.py +++ b/src/python/arcor2_runtime/action.py @@ -107,6 +107,13 @@ def read_stdin(timeout: float = 0.0) -> str | None: return None +def print_event(event: Event) -> None: + """Used from main script to print event as JSON.""" + + print(event.to_json()) + sys.stdout.flush() + + def _get_commands(): """Reads stdin and checks for commands from parent script (e.g. Execution unit). Prints events to stdout. State is signalled using events. @@ -161,13 +168,6 @@ def handle_stdin_commands(*, before: bool, breakpoint: bool = False) -> None: g.resume.wait() -def print_event(event: Event) -> None: - """Used from main script to print event as JSON.""" - - print(event.to_json()) - sys.stdout.flush() - - F = TypeVar("F", bound=Callable[..., Any])