From 706f5ad484c23ed29654581a429a6d05c3593d55 Mon Sep 17 00:00:00 2001 From: ZdenekM Date: Wed, 22 May 2024 09:31:19 +0200 Subject: [PATCH] feat(arcor2_build): updated dependency to Project 2.0.0 --- README.md | 2 +- compose-files/fit-demo/docker-compose.yml | 6 +++--- pants-plugins/macros.py | 2 +- src/docker/arcor2_build/BUILD | 2 +- src/python/arcor2/clients/project_service.py | 2 +- src/python/arcor2_build/CHANGELOG.md | 6 ++++++ src/python/arcor2_build/VERSION | 2 +- src/python/arcor2_build_data/__init__.py | 2 +- src/python/arcor2_mocks/CHANGELOG.md | 6 ++++++ src/python/arcor2_mocks/VERSION | 2 +- src/python/arcor2_mocks/scripts/mock_asset.py | 2 +- src/python/arcor2_mocks/scripts/mock_project.py | 2 +- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 81ce21af8..74293efd5 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The following video by [Kinali](https://www.kinali.cz/en/) shows the use case (o [README](src/python/arcor2_build/README.md) | [CHANGELOG](src/python/arcor2_build/CHANGELOG.md) - - 2024-04-11: [1.4.0](https://github.com/robofit/arcor2/releases/tag/arcor2_build%2F1.4.0) ([docker](https://hub.docker.com/r/arcor2/arcor2_build/tags?page=1&ordering=last_updated&name=1.4.0), [pypi](https://pypi.org/project/arcor2-build/1.4.0/)). + - 2024-05-22: [1.5.0](https://github.com/robofit/arcor2/releases/tag/arcor2_build%2F1.5.0) ([docker](https://hub.docker.com/r/arcor2/arcor2_build/tags?page=1&ordering=last_updated&name=1.5.0), [pypi](https://pypi.org/project/arcor2-build/1.5.0/)). ### arcor2_build_data diff --git a/compose-files/fit-demo/docker-compose.yml b/compose-files/fit-demo/docker-compose.yml index 613e490f0..e51487b06 100644 --- a/compose-files/fit-demo/docker-compose.yml +++ b/compose-files/fit-demo/docker-compose.yml @@ -47,7 +47,7 @@ services: - ARCOR2_KINECT_AZURE_URL=http://192.168.104.100:5017 # Run kinect using pants fit-demo-build: - image: arcor2/arcor2_build:1.4.0 + image: arcor2/arcor2_build:1.5.0 container_name: fit-demo-build depends_on: fit-demo-project: @@ -170,7 +170,7 @@ services: - "5013:5013" fit-demo-asset: - image: registry.gitlab.com/kinalisoft/test-it-off/asset:1.0.0 + image: registry.gitlab.com/kinalisoft/test-it-off/asset:2.0.0 container_name: "fit-demo-asset" environment: - "ASSETS_FOLDER=/tmp/assets" @@ -184,7 +184,7 @@ services: - "10040:10040" fit-demo-project: - image: registry.gitlab.com/kinalisoft/test-it-off/project:1.0.1 + image: registry.gitlab.com/kinalisoft/test-it-off/project:2.0.0 container_name: "fit-demo-project" ports: - "10000-10001:10000-10001" diff --git a/pants-plugins/macros.py b/pants-plugins/macros.py index d41097cc4..da3df69a2 100644 --- a/pants-plugins/macros.py +++ b/pants-plugins/macros.py @@ -62,7 +62,7 @@ def arcor2_python_distribution(name: str, description: str, binaries=None, **kwa kwargs["sdist"] = True kwargs["wheel"] = True - kwargs["wheel_config_settings"] = {"--global-option": ["--python-tag", "py310"]} + kwargs["wheel_config_settings"] = {"--global-option": ["--python-tag", "py311"]} if binaries: kwargs["entry_points"] = {"console_scripts": binaries} diff --git a/src/docker/arcor2_build/BUILD b/src/docker/arcor2_build/BUILD index 187718574..4f90bab58 100644 --- a/src/docker/arcor2_build/BUILD +++ b/src/docker/arcor2_build/BUILD @@ -1 +1 @@ -docker_image(name="arcor2_build", repository="arcor2/arcor2_build", image_tags=["1.4.0"]) +docker_image(name="arcor2_build", repository="arcor2/arcor2_build", image_tags=["1.5.0"]) diff --git a/src/python/arcor2/clients/project_service.py b/src/python/arcor2/clients/project_service.py index daa418082..b58f2a146 100644 --- a/src/python/arcor2/clients/project_service.py +++ b/src/python/arcor2/clients/project_service.py @@ -13,7 +13,7 @@ URL = os.getenv("ARCOR2_PROJECT_SERVICE_URL", "http://0.0.0.0:10000") """ -Collection of functions to work with the Project service (0.10.0). +Collection of functions to work with the Project service (2.0.0). All functions raise ProjectServiceException when any failure happens. diff --git a/src/python/arcor2_build/CHANGELOG.md b/src/python/arcor2_build/CHANGELOG.md index 4c61a25ff..48d0116e6 100644 --- a/src/python/arcor2_build/CHANGELOG.md +++ b/src/python/arcor2_build/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +## [1.5.0] - 2024-05-22 + +### Changed + +- Updated dependency on the Project Service (2.0.0). + ## [1.4.0] - 2024-04-11 ### Changed diff --git a/src/python/arcor2_build/VERSION b/src/python/arcor2_build/VERSION index e21e727f9..3e1ad720b 100644 --- a/src/python/arcor2_build/VERSION +++ b/src/python/arcor2_build/VERSION @@ -1 +1 @@ -1.4.0 \ No newline at end of file +1.5.0 \ No newline at end of file diff --git a/src/python/arcor2_build_data/__init__.py b/src/python/arcor2_build_data/__init__.py index 3ed95d7ef..a8a709e1a 100644 --- a/src/python/arcor2_build_data/__init__.py +++ b/src/python/arcor2_build_data/__init__.py @@ -7,7 +7,7 @@ SERVICE_NAME = "Build" URL = os.getenv("ARCOR2_BUILD_URL", "http://0.0.0.0:5008") -DEPENDENCIES: dict[str, str] = {"Project": "1.0.0"} +DEPENDENCIES: dict[str, str] = {"Project": "2.0.0"} @dataclass diff --git a/src/python/arcor2_mocks/CHANGELOG.md b/src/python/arcor2_mocks/CHANGELOG.md index ec78de034..132c1e563 100644 --- a/src/python/arcor2_mocks/CHANGELOG.md +++ b/src/python/arcor2_mocks/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +## [1.2.0] - WIP + +### Changed + +- API versions updated to 2.0.0. + ## [1.1.0] - 2024-04-11 ### Changed diff --git a/src/python/arcor2_mocks/VERSION b/src/python/arcor2_mocks/VERSION index 1cc5f657e..867e52437 100644 --- a/src/python/arcor2_mocks/VERSION +++ b/src/python/arcor2_mocks/VERSION @@ -1 +1 @@ -1.1.0 \ No newline at end of file +1.2.0 \ No newline at end of file diff --git a/src/python/arcor2_mocks/scripts/mock_asset.py b/src/python/arcor2_mocks/scripts/mock_asset.py index 46dee9909..6ca40ee79 100644 --- a/src/python/arcor2_mocks/scripts/mock_asset.py +++ b/src/python/arcor2_mocks/scripts/mock_asset.py @@ -236,7 +236,7 @@ def main() -> None: WebApiError, ], args.swagger, - api_version="1.0.0", + api_version="2.0.0", ) diff --git a/src/python/arcor2_mocks/scripts/mock_project.py b/src/python/arcor2_mocks/scripts/mock_project.py index bd86f06c4..1650b5aba 100644 --- a/src/python/arcor2_mocks/scripts/mock_project.py +++ b/src/python/arcor2_mocks/scripts/mock_project.py @@ -958,7 +958,7 @@ def main() -> None: WebApiError, ], args.swagger, - api_version="1.0.0", + api_version="2.0.0", )