From 17a313f747161c89ecde6335a8b79ee24c759993 Mon Sep 17 00:00:00 2001 From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com> Date: Thu, 21 Apr 2022 22:03:13 +0100 Subject: [PATCH 1/2] Update dependencies (#27) * review docs, logs and test * Update setup.py * Update movai-entrypoint.sh Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- README.md | 3 ++- docker/files/movai-entrypoint.sh | 2 -- setup.py | 2 +- tests/docker-compose.yml | 6 +++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 511e722..cd0880c 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ The complete build process requires 2 steps : ## build pip module + rm dist/* python3 -m build . ## install pip module locally @@ -53,7 +54,7 @@ For ROS noetic distribution : For ROS melodic distribution : - docker run -t backend:noetic + docker run -t backend:melodic For ROS noetic distribution : diff --git a/docker/files/movai-entrypoint.sh b/docker/files/movai-entrypoint.sh index bcf9dcd..3782e5c 100755 --- a/docker/files/movai-entrypoint.sh +++ b/docker/files/movai-entrypoint.sh @@ -42,7 +42,5 @@ if [ -n "${START_NODES}" ]; then /usr/bin/python3 ${APP_PATH}/GD_Node.py ${PARAMS} -v & done fi -# Hold until user stops container -tail -f /dev/null fg %1 diff --git a/setup.py b/setup.py index 3c7bd9d..e41639f 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ install_requires=[ "aiohttp==3.6.2", "aiohttp-cors==0.7.0", "requests==2.22.0", "deepdiff==4.0.9", "PyYAML==5.1.2", "rospkg==1.3.0", - "movai_core_shared==1.0.0.7", "dal==1.0.0.20", "movai_core_enterprise==1.0.0.10", "gd_node==1.0.0.2" + "movai_core_shared==1.0.0.8", "dal==1.0.0.21", "movai_core_enterprise==1.0.0.12", "gd_node==1.0.0.3" ], entry_points={}, ) diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index b01e81d..949d882 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -78,6 +78,10 @@ services: environment: <<: *movai-common-env APT_INSTALL_LIST: "$BACKEND_APP_PACKAGES" + MOVAI_STDOUT_VERBOSITY_LEVEL: 30 + MOVAI_HEALTHNODE_VERBOSITY_LEVEL: 30 + MOVAI_LOGFILE_VERBOSITY_LEVEL: 30 + MOVAI_GENERAL_VERBOSITY_LEVEL: 30 ports: - 5004:5004 command: @@ -92,7 +96,7 @@ services: sleep 5 done printf "Adding default user\n" - python3 -m tools.new_user -u ${STUDIO_USER_USERNAME:-movai} -p ${STUDIO_USER_USERNAME:-movai} -s + python3 -m backend.tools.new_user -u "${USER_USERNAME:-movai}" -p "${USER_PASSWORD:-movai}" -s printf "Ready to serve\n" fg % healthcheck: From ad0af81b2c45cde9d665b47701f5e5f953a85f55 Mon Sep 17 00:00:00 2001 From: Automatic Date: Thu, 21 Apr 2022 21:04:55 +0000 Subject: [PATCH 2/2] Automatic Bump of build version --- .bumpversion.cfg | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4fb932b..4627876 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.0-13 +current_version = 1.0.0-14 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/setup.py b/setup.py index e41639f..c58d592 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ # The 'install_requires' is where you specify the package dependencies of your package. They will be automaticly installed, before your package. # noqa: E501 setuptools.setup( name="backend", - version="1.0.0-13", + version="1.0.0-14", author="Backend team", author_email="backend@mov.ai", description="Dummy description",