Merge pull request #53 from embarktrucks/sanjeevanil/SIMS-62-update-min-max-value-observer-to-support-new-msgs-no-code

Add second constructor for RosMessage which can pass in msg_def_ as well

Author: sanjlakshmi

.bazelversion

@@ -1 +1 @@
-3.7.0
+5.4.0

.github/workflows/main.yml

@@ -15,17 +15,17 @@ jobs:
       - uses: actions/checkout@v2
       - name: Build manylinux image
         run: |
-          docker build -t embag .
+          docker build -t embag --build-arg BAZEL_VERSION=$(cat .bazelversion) .
           docker run -v $PWD:/tmp/cp --rm -t embag bash -c "cp /tmp/out/*.whl /tmp/cp"
 
       - name: Upload .whl artifacts
         uses: actions/upload-artifact@v2.1.4
         with:
           name: python_wheels
           path: embag-*.whl
-  
+
   debian_package_build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04 # Need to use Python3.8 for pybind11 (Ubuntu 22.04 uses Python3.10)
     steps:
       - uses: actions/checkout@v2
       - name: Mount bazel cache
@@ -40,7 +40,7 @@ jobs:
         with:
           name: debian_packages
           path: bazel-bin/lib/embag_*.deb
-  
+
   macos_build:
     runs-on: macos-10.15
     strategy:
@@ -66,5 +66,5 @@ jobs:
         with:
           name: python_wheels
           path: /tmp/out/embag-*.whl
-          
-      
+
+

Dockerfile

@@ -1,9 +1,16 @@
 FROM quay.io/pypa/manylinux2014_x86_64
 
-RUN yum install npm git python-devel python2-pip gdb -y -q && \
+ARG BAZEL_VERSION
+
+ENV USE_BAZEL_VERSION=$BAZEL_VERSION
+
+RUN yum install npm git python-devel python2-pip python3-pip gdb -y -q && \
+    npm install -g npm@9.2.0 \
     npm install -g @bazel/bazelisk && \
-    pip install wheel && \
-    pip install --upgrade "pip < 21.0"
+    python -m pip install --upgrade "pip < 21.0" --user && \
+    python -m pip install wheel --user && \
+    python3 -m pip install --upgrade "pip < 21.0" --user && \
+    python3 -m pip install wheel --user
 
 RUN mkdir -p /tmp/embag /tmp/pip_build /tmp/out
 COPY WORKSPACE /tmp/embag

lib/ros_message.h

@@ -24,6 +24,25 @@ class RosMessage {
   {
   }
 
+  RosMessage(
+    const std::string& topic,
+    const RosValue::ros_time_t& timestamp,
+    const std::string& md5,
+    const std::shared_ptr<std::vector<char>>& raw_buffer,
+    size_t offset,
+    uint32_t raw_data_len,
+    const std::shared_ptr<RosMsgTypes::MsgDef>& msg_def
+  )
+    : topic(topic)
+    , timestamp(timestamp)
+    , md5(md5)
+    , raw_buffer(raw_buffer)
+    , raw_buffer_offset(offset)
+    , raw_data_len(raw_data_len)
+    , msg_def_(msg_def)
+  {
+  }
+
   const RosValue::Pointer &data() {
     if (!parsed_) {
       hydrate();

lib/version.bzl

@@ -1 +1 @@
-EMBAG_VERSION = "0.0.42"
+EMBAG_VERSION = "0.0.43"

pip_package/build.sh

@@ -1,23 +1,25 @@
 #!/bin/bash -e
 
 function build() {
-  PYTHON_PATH=$1
+  PYTHON_PARENT_FOLDER=$1
   PYTHON_VERSION=$2
 
+  PYTHON_PATH="$PYTHON_PARENT_FOLDER/python$PYTHON_VERSION"
+
   # Install necessary dependencies
-  "$PYTHON_PATH/pip" install -r /tmp/pip_build/requirements.txt
+  "$PYTHON_PATH" -m pip install -r /tmp/pip_build/requirements.txt --user
 
   # Build embag libs and echo test binary
   (cd /tmp/embag &&
-    PYTHON_BIN_PATH="$PYTHON_PATH/python" bazel build -c opt //python:libembag.so //embag_echo:embag_echo &&
-    PYTHON_BIN_PATH="$PYTHON_PATH/python" bazel test -c opt //test:embag_test "//test:embag_test_python$PYTHON_VERSION" --cache_test_results=no --test_output=all)
+    PYTHON_BIN_PATH="$PYTHON_PATH" bazel build -c opt //python:libembag.so //embag_echo:embag_echo &&
+    PYTHON_BIN_PATH="$PYTHON_PATH" bazel test -c opt //test:embag_test "//test:embag_test_python$PYTHON_VERSION" --cache_test_results=no --test_output=all)
 
   # Build wheel
   cp /tmp/embag/bazel-bin/python/libembag.so /tmp/pip_build/embag
-  (cd /tmp/pip_build && "$PYTHON_PATH/python" setup.py bdist_wheel &&
+  (cd /tmp/pip_build && "$PYTHON_PATH" setup.py bdist_wheel &&
     auditwheel repair /tmp/pip_build/dist/embag*.whl --plat manylinux2014_x86_64 &&
-    "$PYTHON_PATH/pip" install wheelhouse/embag*.whl &&
-    "$PYTHON_PATH/python" -c 'import embag; embag.View(); print("Successfully loaded embag!")' &&
+    "$PYTHON_PATH" -m pip install wheelhouse/embag*.whl --user &&
+    "$PYTHON_PATH" -c 'import embag; embag.View(); print("Successfully loaded embag!")' &&
     cp wheelhouse/* /tmp/out &&
     rm wheelhouse/* &&
     rm -rf build dist)