From dd5108214f747780ac401ab50a2b6ae97f1480fc Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 1 Dec 2023 08:11:50 +0100 Subject: [PATCH] Fix empy dep (#213) --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- README.md | 2 +- docker/Dockerfile | 2 +- docker/install_micro_ros_deps_script.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 537d8f6a..f66e1f20 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,11 +33,11 @@ jobs: export DEBIAN_FRONTEND=noninteractive apt install -y git python3-pip . $IDF_PATH/export.sh - pip3 install catkin_pkg lark-parser empy colcon-common-extensions + pip3 install catkin_pkg lark-parser colcon-common-extensions # This line avoids the error when using Python < 3.7 https://importlib-resources.readthedocs.io/en/latest/ pip3 install importlib-resources # this installs the modules also for global python interpreter, needed for IDF v5 - /usr/bin/pip3 install catkin_pkg lark-parser empy colcon-common-extensions importlib-resources + /usr/bin/pip3 install catkin_pkg lark-parser colcon-common-extensions importlib-resources # This line can be removed when https://github.com/colcon/colcon-python-setup-py/issues/56 is solved - name: Patch setuptools diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 66e56551..eef5a8c3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -36,11 +36,11 @@ jobs: export DEBIAN_FRONTEND=noninteractive apt install -y git python3-pip . $IDF_PATH/export.sh - pip3 install catkin_pkg lark-parser empy colcon-common-extensions + pip3 install catkin_pkg lark-parser colcon-common-extensions # This line avoids the error when using Python < 3.7 https://importlib-resources.readthedocs.io/en/latest/ pip3 install importlib-resources # this installs the modules also for global python interpreter, needed for IDF v5 - /usr/bin/pip3 install catkin_pkg lark-parser empy colcon-common-extensions importlib-resources + /usr/bin/pip3 install catkin_pkg lark-parser colcon-common-extensions importlib-resources # This line can be removed when https://github.com/colcon/colcon-python-setup-py/issues/56 is solved - name: Patch setuptools diff --git a/README.md b/README.md index f86d3d1d..6558134b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This component needs `colcon` and other Python 3 packages inside the IDF virtual ```bash . $IDF_PATH/export.sh -pip3 install catkin_pkg lark-parser empy colcon-common-extensions +pip3 install catkin_pkg lark-parser colcon-common-extensions ``` ## Middlewares available diff --git a/docker/Dockerfile b/docker/Dockerfile index ab3480fc..f7f19243 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,7 +19,7 @@ RUN mkdir -p /tmp/install_micro_ros_deps_script && mv /install_micro_ros_deps_sc IDF_EXPORT_QUIET=1 /tmp/install_micro_ros_deps_script/install_micro_ros_deps_script.sh && \ rm -rf /var/lib/apt/lists/* -RUN /usr/bin/pip3 --no-cache-dir install catkin_pkg lark-parser empy colcon-common-extensions importlib-resources +RUN /usr/bin/pip3 --no-cache-dir install catkin_pkg lark-parser colcon-common-extensions importlib-resources ARG USER_ID=espidf RUN useradd --create-home --home-dir /home/$USER_ID --shell /bin/bash --user-group --groups adm,sudo $USER_ID && \ diff --git a/docker/install_micro_ros_deps_script.sh b/docker/install_micro_ros_deps_script.sh index 496bba49..645705ed 100755 --- a/docker/install_micro_ros_deps_script.sh +++ b/docker/install_micro_ros_deps_script.sh @@ -5,6 +5,6 @@ set -eu sudo apt update -q sudo apt install -yq python3-pip source $IDF_PATH/export.sh -pip3 install catkin_pkg lark-parser empy colcon-common-extensions importlib-resources +pip3 install catkin_pkg lark-parser colcon-common-extensions importlib-resources set +u