From 51ec79966f51abad0a387183276edd9e8889bbb3 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 17 Jul 2026 15:28:29 +0200 Subject: [PATCH 1/3] CMake: clean submodule --- CMakeLists.txt | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 544ffa79..c6aa58a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,35 +20,23 @@ set(PROJECT_DESCRIPTION "Tutorial for humanoid path planner platform.") set(PROJECT_USE_CMAKE_EXPORT TRUE) set(CXX_DISABLE_WERROR TRUE) -# Check if the submodule cmake have been initialized -set(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake") -if(EXISTS "${JRL_CMAKE_MODULES}/base.cmake") - message(STATUS "JRL cmakemodules found in 'cmake/' git submodule") +find_package(jrl-cmakemodules QUIET CONFIG) +if(jrl-cmakemodules_FOUND) + get_property( + JRL_CMAKE_MODULES + TARGET jrl-cmakemodules::jrl-cmakemodules + PROPERTY INTERFACE_INCLUDE_DIRECTORIES + ) + message(STATUS "JRL cmakemodules found on system at ${JRL_CMAKE_MODULES}") else() - find_package(jrl-cmakemodules QUIET CONFIG) - if(jrl-cmakemodules_FOUND) - get_property( - JRL_CMAKE_MODULES - TARGET jrl-cmakemodules::jrl-cmakemodules - PROPERTY INTERFACE_INCLUDE_DIRECTORIES - ) - message( - STATUS - "JRL cmakemodules found on system at ${JRL_CMAKE_MODULES}" - ) - else() - message(STATUS "JRL cmakemodules not found. Let's fetch it.") - include(FetchContent) - FetchContent_Declare( - "jrl-cmakemodules" - GIT_REPOSITORY "https://github.com/jrl-umi3218/jrl-cmakemodules.git" - ) - FetchContent_MakeAvailable("jrl-cmakemodules") - FetchContent_GetProperties( - "jrl-cmakemodules" - SOURCE_DIR JRL_CMAKE_MODULES - ) - endif() + message(STATUS "JRL cmakemodules not found. Let's fetch it.") + include(FetchContent) + FetchContent_Declare( + "jrl-cmakemodules" + GIT_REPOSITORY "https://github.com/jrl-umi3218/jrl-cmakemodules.git" + ) + FetchContent_MakeAvailable("jrl-cmakemodules") + FetchContent_GetProperties("jrl-cmakemodules" SOURCE_DIR JRL_CMAKE_MODULES) endif() include("${JRL_CMAKE_MODULES}/hpp.cmake") From 1a1d0c6d66dd301dfde4869a20b35b46dd23cf62 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 17 Jul 2026 15:40:42 +0200 Subject: [PATCH 2/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'gepetto': 'github:gepetto/nix/bb788a93d4d821772070fd5ab40491cef0910a5b?narHash=sha256-YxzK%2BK/Zzw24cV6uaVsLDMTLDpONz0bZRSXW7HVW3HA%3D' (2026-06-30) → 'github:gepetto/nix/166caeac8f09def7818c47bbfcc08777c2c3fbc4?narHash=sha256-hZYhxeG510Ui/RSviEM7KyON8RiQoHFD7SY3y4%2B1zKA%3D' (2026-07-17) • Updated input 'gepetto/gazebros2nix': 'github:gepetto/gazebros2nix/6e51068e9e9fec8e960f68911127ad64b417bf6b?narHash=sha256-vXVLP31bnnk8KUBUV88Ms2R6P06wdQPZzsXgR6iZ5FI%3D' (2026-06-27) → 'github:gepetto/gazebros2nix/662fcd41e6bab21ef6cce4e9e3d0a4e6221961dc?narHash=sha256-ah05yiNKtTipRI1rseMOfqXCTaqEX5TM%2Bo9lz3IQd%2BM%3D' (2026-07-08) • Updated input 'gepetto/gazebros2nix/pyproject-nix': 'github:pyproject-nix/pyproject.nix/43f0b40edd0a74c63f66b7b48d969ae6b740d611?narHash=sha256-LRD1SuQWr49fGq3A%2B8GLXfsLE2xqIpQA440YDZwms3M%3D' (2026-06-22) → 'github:pyproject-nix/pyproject.nix/7af23cfe91064865ecf2e835da28b45b3c6f49fd?narHash=sha256-SvXJcAemihifkTn4BGvyE5K1FJX9bl4U8DQ5pqKvD0s%3D' (2026-07-01) • Updated input 'gepetto/gazebros2nix/uv2nix': 'github:pyproject-nix/uv2nix/14aa44100859a44144878fe079f8089d3fa4dc4e?narHash=sha256-PQfvfKWaBvCysdHFUO5GewwvwIqI/WL6OcrJhDSUdbc%3D' (2026-06-18) → 'github:pyproject-nix/uv2nix/83995ef5e4ece3c9c704aa645bbff439e15a0ac3?narHash=sha256-Z/Ss9rWw9QYcRK%2BQqkmty7PB1pIik5XGbrtit%2Bad2qs%3D' (2026-07-08) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0694490c..d77b63b1 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1782566589, - "narHash": "sha256-vXVLP31bnnk8KUBUV88Ms2R6P06wdQPZzsXgR6iZ5FI=", + "lastModified": 1783519093, + "narHash": "sha256-ah05yiNKtTipRI1rseMOfqXCTaqEX5TM+o9lz3IQd+M=", "owner": "gepetto", "repo": "gazebros2nix", - "rev": "6e51068e9e9fec8e960f68911127ad64b417bf6b", + "rev": "662fcd41e6bab21ef6cce4e9e3d0a4e6221961dc", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1782843986, - "narHash": "sha256-YxzK+K/Zzw24cV6uaVsLDMTLDpONz0bZRSXW7HVW3HA=", + "lastModified": 1784295348, + "narHash": "sha256-hZYhxeG510Ui/RSviEM7KyON8RiQoHFD7SY3y4+1zKA=", "owner": "gepetto", "repo": "nix", - "rev": "bb788a93d4d821772070fd5ab40491cef0910a5b", + "rev": "166caeac8f09def7818c47bbfcc08777c2c3fbc4", "type": "github" }, "original": { @@ -408,11 +408,11 @@ ] }, "locked": { - "lastModified": 1782089418, - "narHash": "sha256-LRD1SuQWr49fGq3A+8GLXfsLE2xqIpQA440YDZwms3M=", + "lastModified": 1782905613, + "narHash": "sha256-SvXJcAemihifkTn4BGvyE5K1FJX9bl4U8DQ5pqKvD0s=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "43f0b40edd0a74c63f66b7b48d969ae6b740d611", + "rev": "7af23cfe91064865ecf2e835da28b45b3c6f49fd", "type": "github" }, "original": { @@ -563,11 +563,11 @@ ] }, "locked": { - "lastModified": 1781810314, - "narHash": "sha256-PQfvfKWaBvCysdHFUO5GewwvwIqI/WL6OcrJhDSUdbc=", + "lastModified": 1783511944, + "narHash": "sha256-Z/Ss9rWw9QYcRK+Qqkmty7PB1pIik5XGbrtit+ad2qs=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "14aa44100859a44144878fe079f8089d3fa4dc4e", + "rev": "83995ef5e4ece3c9c704aa645bbff439e15a0ac3", "type": "github" }, "original": { From c6288a099b68370143a5d230702bedb71290ea29 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 17 Jul 2026 15:54:29 +0200 Subject: [PATCH 3/3] clean pip packaging --- pyproject.toml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2c41eb61..4ef6a289 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,26 @@ -[tool.ruff] -extend-exclude = ["cmake"] +[build-system] +build-backend = "cmeel" +requires = [ + "cmeel[build]", + "example-robot-data[build]", + "hpp-gepetto-viewer[build]", + "hpp-manipulation[build]" +] + +[project] +dependencies = [ + "example-robot-data", + "hpp-gepetto-viewer", + "hpp-manipulation" +] +description = "Tutorial for Humanoid path planner platform" +license = "BSD-2-Clause" +name = "hpp-tutorial" +version = "9.0.0" + +[tool.cmeel] +has-binaries = false +has-sitelib = false [tool.ruff.lint] extend-select = ["I", "NPY", "RUF", "UP", "W"]