From db5a51c49dc593b0fde6649ece5439d2f4ad2e30 Mon Sep 17 00:00:00 2001 From: cooperrunyan Date: Thu, 28 May 2026 17:18:27 -0700 Subject: [PATCH] Change nlohmann_json to nlohmann-json-dev This allows the nlohmann json library dependency to be installed with rosdep, and the ros2.repos file can be deleted. --- .devcontainer/Dockerfile | 3 +-- .docker/Dockerfile | 3 +-- .dockerignore | 1 - .github/workflows/ci.yml | 2 -- README.md | 5 ++--- libwaterlinked/package.xml | 2 +- ros2.repos | 6 ------ 7 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 ros2.repos diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2f6307d..cb63b58 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -52,12 +52,11 @@ RUN python3 -m venv --system-site-packages $VIRTUAL_ENV \ ENV PATH="$VIRTUAL_ENV/bin:$PATH" # Install all ROS dependencies -RUN vcs import src < src/$PROJECT_NAME/ros2.repos WORKDIR $USER_WORKSPACE RUN sudo apt-get -q update \ && sudo apt-get -q -y upgrade \ && rosdep update \ - && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --skip-keys nlohmann_json \ + && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} \ && sudo apt-get autoremove -y \ && sudo apt-get clean -y \ && sudo rm -rf /var/lib/apt/lists/* diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a207fe4..d58f7ac 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -52,12 +52,11 @@ RUN python3 -m venv --system-site-packages $VIRTUAL_ENV \ ENV PATH="$VIRTUAL_ENV/bin:$PATH" # Install all ROS dependencies -RUN vcs import src < src/$PROJECT_NAME/ros2.repos WORKDIR $USER_WORKSPACE RUN sudo apt-get -q update \ && sudo apt-get -q -y upgrade \ && rosdep update \ - && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --skip-keys nlohmann_json \ + && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} \ && sudo apt-get autoremove -y \ && sudo apt-get clean -y \ && sudo rm -rf /var/lib/apt/lists/* diff --git a/.dockerignore b/.dockerignore index c7dfec3..c018788 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,5 @@ * # Except the following -!ros2.repos !waterlinked_dvl_driver !libwaterlinked diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec61909..f87ac3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,5 @@ jobs: ROS_DISTRO: ${{ matrix.env.ROS_DISTRO }} CXXFLAGS: -Wall -Wextra -Wpedantic CLANG_TIDY: true - UPSTREAM_WORKSPACE: ros2.repos AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src AFTER_SETUP_DOWNSTREAM_WORKSPACE: vcs pull $BASEDIR/downstream_ws/src - ROSDEP_SKIP_KEYS: nlohmann_json diff --git a/README.md b/README.md index 1adc9e0..bcf49c5 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,10 @@ of your ROS 2 workspace git clone git@github.com:waterlinked/waterlinked_dvl.git ``` -Then install the project dependencies using vcstool and rosdep +Then install the project dependencies using rosdep ```bash -vcs import src < src/waterlinked_dvl/ros2.repos && \ -rosdep install --from paths src -y --ignore-src --skip-keys nlohmann_json +rosdep install --from paths src -y --ignore-src ``` Finally, build the workspace using colcon diff --git a/libwaterlinked/package.xml b/libwaterlinked/package.xml index 25492aa..f30005d 100644 --- a/libwaterlinked/package.xml +++ b/libwaterlinked/package.xml @@ -18,7 +18,7 @@ eigen3_cmake_module eigen - nlohmann_json + nlohmann-json-dev ament_cmake_gtest ament_cmake_gmock diff --git a/ros2.repos b/ros2.repos deleted file mode 100644 index b974136..0000000 --- a/ros2.repos +++ /dev/null @@ -1,6 +0,0 @@ -repositories: - - json: - type: git - url: https://github.com/nlohmann/json - version: master