From a71061608f76dc080a427e8556a532ebdec169cb Mon Sep 17 00:00:00 2001 From: Fabian Immel Date: Mon, 12 Feb 2024 19:32:48 +0100 Subject: [PATCH 1/3] use oldest-supported-numpy for ABI compatibility --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 62a084f8..c7197e18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,8 +73,8 @@ RUN if [ "${ROS_DISTRO}" = "melodic" ] || [ "${ROS_DISTRO}" = "kinetic" ]; \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -# install python dependencies (numpy) -RUN pip install numpy +# install python dependencies (oldest-supported-numpy for ABI compatibility) +RUN pip install oldest-supported-numpy # ros version specific dependencies RUN set -ex; \ From cf992c16e3bccfd79b43b1304e7c6fead68af77c Mon Sep 17 00:00:00 2001 From: Fabian Immel Date: Mon, 12 Feb 2024 20:13:29 +0100 Subject: [PATCH 2/3] move to correct dockerfile --- .github/conan_dockerfile/Dockerfile | 3 ++- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/conan_dockerfile/Dockerfile b/.github/conan_dockerfile/Dockerfile index d8d38c7e..d670fbc6 100644 --- a/.github/conan_dockerfile/Dockerfile +++ b/.github/conan_dockerfile/Dockerfile @@ -14,7 +14,8 @@ RUN sudo -E apt-get update \ ARG PY_VERSION=3.8 RUN pyenv install -s $PY_VERSION \ && pyenv global $PY_VERSION -RUN pip install "conan==1.59.0" catkin_pkg numpy wheel auditwheel cmake +RUN pip install "conan==1.59.0" catkin_pkg oldest-supported-numpy wheel auditwheel cmake +# oldest-supported-numpy for ABI compatibility # install patchelf RUN wget https://github.com/NixOS/patchelf/releases/download/0.17.2/patchelf-0.17.2-x86_64.tar.gz \ diff --git a/Dockerfile b/Dockerfile index c7197e18..62a084f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,8 +73,8 @@ RUN if [ "${ROS_DISTRO}" = "melodic" ] || [ "${ROS_DISTRO}" = "kinetic" ]; \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -# install python dependencies (oldest-supported-numpy for ABI compatibility) -RUN pip install oldest-supported-numpy +# install python dependencies (numpy) +RUN pip install numpy # ros version specific dependencies RUN set -ex; \ From 977593bb19d8c69aba0319976582bf1f78e3e117 Mon Sep 17 00:00:00 2001 From: Fabian Immel Date: Mon, 12 Feb 2024 20:36:14 +0100 Subject: [PATCH 3/3] add download note --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65159f74..62b43ba0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ https://pypi.org/project/lanelet2/) Convert Lanelet2 maps directly to instance labels for map perception and other map-based learning tasks! `lanelet2_ml_converter` provides local instance labels of various abstraction layers and representations accessible as numpy arrays from python. Check out the `lanelet2_ml_converter` module for more information and usage examples. -**Note:** As the module is not released officially yet, to try it out you need to either build Lanelet2 with the python bindings yourself or manually install the pip wheel files from the CI artefacts (download [here](https://github.com/immel-f/Lanelet2/actions/runs/7820288630/artifacts/1228128122)). +**Note:** As the module is not released officially yet, to try it out you need to either build Lanelet2 with the python bindings yourself or manually install the pip wheel files from the CI artefacts (download [here](https://github.com/immel-f/Lanelet2/actions/runs/7876754592/artifacts/1239381043) with a logged in GitHub account). ## Overview