Skip to content

Commit

Permalink
fix(arcor2_execution): wrong order of functions
Browse files Browse the repository at this point in the history
  • Loading branch information
ZdenekM authored and ZdenekM committed Jun 19, 2024
1 parent ead898d commit 99336c7
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion compose-files/fit-demo/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/docker/arcor2_execution/BUILD
Original file line number Diff line number Diff line change
@@ -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"])
6 changes: 6 additions & 0 deletions src/python/arcor2_execution/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/python/arcor2_execution/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.0
1.4.1
14 changes: 7 additions & 7 deletions src/python/arcor2_runtime/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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])


Expand Down

0 comments on commit 99336c7

Please sign in to comment.