From dc26af39a82d149bb8ee20ce094ef582859035c8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:26:06 +0000 Subject: [PATCH 01/15] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.4.8 → v0.5.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.8...v0.5.0) - [github.com/pre-commit/mirrors-clang-format: v18.1.6 → v18.1.8](https://github.com/pre-commit/mirrors-clang-format/compare/v18.1.6...v18.1.8) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2e9834..8d2133d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_branch: devel repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.8 + rev: v0.5.0 hooks: - id: ruff args: @@ -19,7 +19,7 @@ repos: - id: toml-sort-fix exclude: poetry.lock - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.6 + rev: v18.1.8 hooks: - id: clang-format args: From c7545101b7c99c59902603c0e3f246bd54ab4f7e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 2 Jul 2024 11:14:37 +0200 Subject: [PATCH 02/15] nix: update after v5.1.0 --- flake.lock | 48 +++++++++++------------------------------------- flake.nix | 2 +- 2 files changed, 12 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index fb3a34d..5ab78aa 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -58,22 +58,20 @@ ], "hpp-core": "hpp-core", "hpp-template-corba": "hpp-template-corba", - "hpp-util": "hpp-util_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1719670731, - "narHash": "sha256-1EKv+2sWT3XNrqI+YhJwxrE0Zq77D9k96vnhYJl4KX4=", + "lastModified": 1719772432, + "narHash": "sha256-qFcBT/YDTsrAzEE//JmCbk1TnVrnYcme1WCzkPaXwZ0=", "owner": "humanoid-path-planner", "repo": "hpp-corbaserver", - "rev": "ab24564c4165f51017bf00c84dc8c16c239ba1fe", + "rev": "f623d8cd51e627a12e7c6f240781dd7f4a5b7ddf", "type": "github" }, "original": { "owner": "humanoid-path-planner", - "ref": "release/5.1.0", "repo": "hpp-corbaserver", "type": "github" } @@ -218,6 +216,8 @@ ], "hpp-util": [ "hpp-corbaserver", + "hpp-core", + "hpp-constraints", "hpp-util" ], "nixpkgs": [ @@ -270,39 +270,13 @@ "type": "github" } }, - "hpp-util_2": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "flake-parts" - ], - "nixpkgs": [ - "hpp-corbaserver", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719580825, - "narHash": "sha256-trfl8A+P7a1gnACnTXNK98TYWWDAOM3PKfkXxpC3X/8=", - "owner": "humanoid-path-planner", - "repo": "hpp-util", - "rev": "0504f15818a92c7a257cd6b60cd8b6092bd6dbfa", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-util", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1719585538, - "narHash": "sha256-AGXFOkdQb3rOh0aRqY52Z6ObRhWmAoFXrbYZHHqhX5A=", + "lastModified": 1719674427, + "narHash": "sha256-z2hCpVyfnmYTA5iabf1SW4peFV9itE1JJcXNBKIFkDg=", "owner": "nim65s", "repo": "nixpkgs", - "rev": "e3d93c526fe07a2c58ab1f8bec4ea77054f78062", + "rev": "b81610d293fac26c2ec6a81718a979bc25f8c155", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 25d415d..1a899fe 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; hpp-corbaserver = { - url = "github:humanoid-path-planner/hpp-corbaserver/release/5.1.0"; + url = "github:humanoid-path-planner/hpp-corbaserver"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; From 5d5bce5ab5423d0bc7aaf5e7babde2ded447cefa Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 2 Jul 2024 11:52:05 +0200 Subject: [PATCH 03/15] nix ci: cachix only on HPP org --- .github/workflows/nix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 1ac391b..9488350 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -15,5 +15,6 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@main - run: nix --accept-flake-config build -L - run: nix --accept-flake-config run .#cachix push gepetto $(readlink result) + if: github.repository_owner == 'humanoid-path-planner' env: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} From 6fa9a8d6c7af71a958a912b260b6eadc1c25e367 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 4 Jul 2024 13:37:44 +0200 Subject: [PATCH 04/15] pre-commit autoupdate --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4d3c449..8d2133d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: toml-sort-fix exclude: poetry.lock - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.7 + rev: v18.1.8 hooks: - id: clang-format args: From 3a20918188d6c7ced35f87e481302854dcc189eb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:15:09 +0000 Subject: [PATCH 05/15] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.5.0 → v0.5.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.0...v0.5.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8d2133d..310e95e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_branch: devel repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.0 + rev: v0.5.1 hooks: - id: ruff args: From cf5c1fb57294724244e52ed392f5bcc9dd3f4da8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 17:24:57 +0000 Subject: [PATCH 06/15] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.5.1 → v0.5.5](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.1...v0.5.5) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 310e95e..263f1be 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_branch: devel repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.1 + rev: v0.5.5 hooks: - id: ruff args: From 9f51b5cba1319cc0756e5e6056bef427b8ab247e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:21:13 +0000 Subject: [PATCH 07/15] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.5.5 → v0.6.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.5...v0.6.3) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 263f1be..f9b5d02 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_branch: devel repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.5 + rev: v0.6.3 hooks: - id: ruff args: From 02c0ae40c5ebd4cdc57eb28589c3a95e08597fb3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:21:55 +0000 Subject: [PATCH 08/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/romeo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/romeo.py b/scripts/romeo.py index 41f4beb..ae7d73f 100644 --- a/scripts/romeo.py +++ b/scripts/romeo.py @@ -1,10 +1,11 @@ import random +from hpp_ros import PathPlayer, ScenePublisher + from hpp import Quaternion # noqa: F401 from hpp.corbaserver import ProblemSolver from hpp.corbaserver.romeo import Robot from hpp.corbaserver.wholebody_step.client import Client as WholebodyStepClient -from hpp_ros import PathPlayer, ScenePublisher robot = Robot("romeo") robot.setJointBounds("base_joint_x", [-4, 3]) From 4513229bfc6887873083a03d5c395c6970639a89 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 11 Sep 2024 18:57:43 +0200 Subject: [PATCH 09/15] CMake: python option --- CMakeLists.txt | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f83d0a5..c805575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,12 @@ cmake_minimum_required(VERSION 3.10) set(PROJECT_NAME hpp_romeo) set(PROJECT_DESCRIPTION "Python and ros launch files for Romeo robot in hpp.") -set(PROJECT_USE_CMAKE_EXPORT TRUE) +option(BUILD_PYTHON_INTERFACE "Build the python bindings" ON) +option(INSTALL_PYTHON_INTERFACE_ONLY "Install *ONLY* the python bindings" OFF) + +if(NOT INSTALL_PYTHON_INTERFACE_ONLY) + set(PROJECT_USE_CMAKE_EXPORT TRUE) +endif(NOT INSTALL_PYTHON_INTERFACE_ONLY) # Check if the submodule cmake have been initialized set(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake") @@ -46,23 +51,29 @@ include("${JRL_CMAKE_MODULES}/python.cmake") compute_project_args(PROJECT_ARGS LANGUAGES CXX) project(${PROJECT_NAME} ${PROJECT_ARGS}) -findpython() +if(BUILD_PYTHON_INTERFACE) + findpython(REQUIRED) +endif(BUILD_PYTHON_INTERFACE) add_project_dependency("hpp-corbaserver" REQUIRED) add_project_dependency("example-robot-data" REQUIRED) -install(FILES src/hpp/corbaserver/romeo/robot.py - src/hpp/corbaserver/romeo/__init__.py - DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/romeo) +if(BUILD_PYTHON_INTERFACE) + install(FILES src/hpp/corbaserver/romeo/robot.py + src/hpp/corbaserver/romeo/__init__.py + DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/romeo) -install(FILES src/hpp/corbaserver/manipulation/romeo/robot.py - src/hpp/corbaserver/manipulation/romeo/__init__.py - DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/romeo) + install(FILES src/hpp/corbaserver/manipulation/romeo/robot.py + src/hpp/corbaserver/manipulation/romeo/__init__.py + DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/romeo) +endif() -install(FILES package.xml DESTINATION share/${PROJECT_NAME}) +if(NOT INSTALL_PYTHON_INTERFACE_ONLY) + install(FILES package.xml DESTINATION share/${PROJECT_NAME}) -add_library(${PROJECT_NAME} INTERFACE) -install( - TARGETS ${PROJECT_NAME} - EXPORT ${TARGETS_EXPORT_NAME} - DESTINATION lib) + add_library(${PROJECT_NAME} INTERFACE) + install( + TARGETS ${PROJECT_NAME} + EXPORT ${TARGETS_EXPORT_NAME} + DESTINATION lib) +endif() From 673982943a08a3151e9e60f5ea9735fae8694b43 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 7 Oct 2024 14:30:44 +0200 Subject: [PATCH 10/15] nix: move package to nixpkgs --- .github/workflows/nix.yml | 18 +-- flake.lock | 262 +------------------------------------- flake.nix | 45 +++---- 3 files changed, 34 insertions(+), 291 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 9488350..cc47550 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -1,6 +1,7 @@ -name: "Nix CI" +name: "CI - Nix" -on: [pull_request, push] +on: + push: jobs: tests: @@ -11,10 +12,9 @@ jobs: os: [ubuntu] steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - run: nix --accept-flake-config build -L - - run: nix --accept-flake-config run .#cachix push gepetto $(readlink result) - if: github.repository_owner == 'humanoid-path-planner' - env: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} + - uses: cachix/install-nix-action@v27 + - uses: cachix/cachix-action@v15 + with: + name: gepetto + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - run: nix build -L diff --git a/flake.lock b/flake.lock index 5ab78aa..291df13 100644 --- a/flake.lock +++ b/flake.lock @@ -20,268 +20,17 @@ "type": "github" } }, - "hpp-constraints": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "hpp-core", - "flake-parts" - ], - "hpp-pinocchio": "hpp-pinocchio", - "hpp-statistics": "hpp-statistics", - "hpp-util": "hpp-util", - "nixpkgs": [ - "hpp-corbaserver", - "hpp-core", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719584695, - "narHash": "sha256-8K94IgUt8kpdRDASnstfX14cBQN4ZK6+LmvOuq6Sg0I=", - "owner": "humanoid-path-planner", - "repo": "hpp-constraints", - "rev": "acd1c62fdfcdb329fd0dea19ae2f18e471e3ef08", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-constraints", - "type": "github" - } - }, - "hpp-corbaserver": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "hpp-core": "hpp-core", - "hpp-template-corba": "hpp-template-corba", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719772432, - "narHash": "sha256-qFcBT/YDTsrAzEE//JmCbk1TnVrnYcme1WCzkPaXwZ0=", - "owner": "humanoid-path-planner", - "repo": "hpp-corbaserver", - "rev": "f623d8cd51e627a12e7c6f240781dd7f4a5b7ddf", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "repo": "hpp-corbaserver", - "type": "github" - } - }, - "hpp-core": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "flake-parts" - ], - "hpp-constraints": "hpp-constraints", - "nixpkgs": [ - "hpp-corbaserver", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719586831, - "narHash": "sha256-oRFZsERQKzaW2NvgcKcxqJZtqtlk7rqDK2inhUTABiQ=", - "owner": "humanoid-path-planner", - "repo": "hpp-core", - "rev": "733f884a03cde41aeae18758a26b28cf6fdf02fa", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-core", - "type": "github" - } - }, - "hpp-environments": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-pinocchio", - "flake-parts" - ], - "nixpkgs": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-pinocchio", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719580427, - "narHash": "sha256-T76zgTJrGm7maKBPwgX+FgQ7MPN7NoLvdZvzARPo9V0=", - "owner": "humanoid-path-planner", - "repo": "hpp-environments", - "rev": "1c727bcc85145a1f5236357fa73df5a183a31f04", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-environments", - "type": "github" - } - }, - "hpp-pinocchio": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "flake-parts" - ], - "hpp-environments": "hpp-environments", - "hpp-util": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-util" - ], - "nixpkgs": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719582071, - "narHash": "sha256-sRWf973UZIdyrS0fhd+vXdTucR9d7Eks9yU85kcFxfo=", - "owner": "humanoid-path-planner", - "repo": "hpp-pinocchio", - "rev": "4ec6186223ce18f4c48605421a7ef583fe827352", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-pinocchio", - "type": "github" - } - }, - "hpp-statistics": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "flake-parts" - ], - "hpp-util": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-util" - ], - "nixpkgs": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719582334, - "narHash": "sha256-bzGI7z6hTGkuNs71Vcb3vsVpey1SuR7Okx4rJU1LHFs=", - "owner": "humanoid-path-planner", - "repo": "hpp-statistics", - "rev": "613b1f9c2788cb33097c1f1c0e4216420665a1e0", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-statistics", - "type": "github" - } - }, - "hpp-template-corba": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "flake-parts" - ], - "hpp-util": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "hpp-util" - ], - "nixpkgs": [ - "hpp-corbaserver", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719587477, - "narHash": "sha256-bUGCrWnAuEqmhD7sunx+L6yqukHueDs99MbHM7M5/8A=", - "owner": "humanoid-path-planner", - "repo": "hpp-template-corba", - "rev": "e5512a9505df6bc9ae317d51e3e14cdc27d6583e", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-template-corba", - "type": "github" - } - }, - "hpp-util": { - "inputs": { - "flake-parts": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "flake-parts" - ], - "nixpkgs": [ - "hpp-corbaserver", - "hpp-core", - "hpp-constraints", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719580825, - "narHash": "sha256-trfl8A+P7a1gnACnTXNK98TYWWDAOM3PKfkXxpC3X/8=", - "owner": "humanoid-path-planner", - "repo": "hpp-util", - "rev": "0504f15818a92c7a257cd6b60cd8b6092bd6dbfa", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "ref": "release/5.1.0", - "repo": "hpp-util", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1719674427, - "narHash": "sha256-z2hCpVyfnmYTA5iabf1SW4peFV9itE1JJcXNBKIFkDg=", - "owner": "nim65s", + "lastModified": 1727174734, + "narHash": "sha256-xa3TynMF5vaWonmTOg/Ejc1Fmo0GkQnCaVRVkBc3z2I=", + "owner": "gepetto", "repo": "nixpkgs", - "rev": "b81610d293fac26c2ec6a81718a979bc25f8c155", + "rev": "0ad139a0e4372abc12320c8c92ee90e0e5e296e1", "type": "github" }, "original": { - "owner": "nim65s", - "ref": "gepetto", + "owner": "gepetto", "repo": "nixpkgs", "type": "github" } @@ -289,7 +38,6 @@ "root": { "inputs": { "flake-parts": "flake-parts", - "hpp-corbaserver": "hpp-corbaserver", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 1a899fe..794b482 100644 --- a/flake.nix +++ b/flake.nix @@ -1,28 +1,17 @@ { description = "Python and ros launch files for Romeo robot in hpp"; - nixConfig = { - extra-substituters = [ "https://gepetto.cachix.org" ]; - extra-trusted-public-keys = [ "gepetto.cachix.org-1:toswMl31VewC0jGkN6+gOelO2Yom0SOHzPwJMY2XiDY=" ]; - }; - inputs = { - nixpkgs.url = "github:nim65s/nixpkgs/gepetto"; + nixpkgs.url = "github:gepetto/nixpkgs"; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; - hpp-corbaserver = { - url = "github:humanoid-path-planner/hpp-corbaserver"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - }; }; outputs = - inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } { - imports = [ ]; + inputs: + inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" @@ -30,20 +19,26 @@ "x86_64-darwin" ]; perSystem = + { pkgs, self', ... }: { - self', - pkgs, - system, - ... - }: - { + devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; }; packages = { - inherit (pkgs) cachix; - default = pkgs.callPackage ./. { - hpp-corbaserver = inputs.hpp-corbaserver.packages.${system}.default; - }; + default = self'.packages.hpp-romeo; + hpp-romeo = pkgs.python3Packages.hpp-romeo.overrideAttrs (_: { + src = pkgs.lib.fileset.toSource { + root = ./.; + fileset = pkgs.lib.fileset.unions [ + ./CMakeLists.txt + ./doc + ./launch + ./package.xml + ./rviz + ./scripts + ./src + ]; + }; + }); }; - devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; }; }; }; } From b3dad75e37ee4973dcbf277128916addeea145c4 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 7 Oct 2024 14:30:55 +0200 Subject: [PATCH 11/15] nix: temporary patches override --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 794b482..f311ac4 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,7 @@ packages = { default = self'.packages.hpp-romeo; hpp-romeo = pkgs.python3Packages.hpp-romeo.overrideAttrs (_: { + patches = []; src = pkgs.lib.fileset.toSource { root = ./.; fileset = pkgs.lib.fileset.unions [ From f4176c28635e9f517b7283278e19684da3ab3894 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 7 Oct 2024 16:44:42 +0200 Subject: [PATCH 12/15] git rm default.nix --- default.nix | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 default.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index 9fa4d1a..0000000 --- a/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - cmake, - hpp-corbaserver, - pkg-config, - python3Packages, -}: - -python3Packages.buildPythonPackage { - pname = "hpp-romeo"; - version = "5.0.0"; - pyproject = false; - - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./CMakeLists.txt - ./doc - ./launch - ./package.xml - ./rviz - ./scripts - ./src - ]; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - propagatedBuildInputs = [ hpp-corbaserver ]; - - meta = { - description = "Python and ros launch files for Romeo robot in hpp"; - homepage = "https://github.com/humanoid-path-planner/hpp_romeo"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.nim65s ]; - }; -} From a54aadf5c936488d2c406675b5cd01bf8d32eec1 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 7 Oct 2024 17:31:58 +0200 Subject: [PATCH 13/15] setup mergify --- .mergify.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..8e98970 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,11 @@ +pull_request_rules: + - name: merge automatically when CI passes and PR is approved + conditions: + - check-success = "gitlab-ci" + - check-success = "Nix build on ubuntu" + - check-success = "pre-commit.ci - pr" + - or: + - author = pre-commit-ci[bot] + - author = dependabot[bot] + actions: + merge: From dde983b2eeed0a821de84f8dcb522c670cba1b07 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:46:37 +0000 Subject: [PATCH 14/15] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.3 → v0.6.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.6.3...v0.6.9) - [github.com/pre-commit/mirrors-clang-format: v18.1.8 → v19.1.1](https://github.com/pre-commit/mirrors-clang-format/compare/v18.1.8...v19.1.1) - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f9b5d02..ae52b97 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_branch: devel repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.3 + rev: v0.6.9 hooks: - id: ruff args: @@ -19,13 +19,13 @@ repos: - id: toml-sort-fix exclude: poetry.lock - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.8 + rev: v19.1.1 hooks: - id: clang-format args: - --style=Google - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-added-large-files - id: check-ast From 3719f4f1c1e491c5e2ba33996848141644c7c8bc Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 8 Oct 2024 13:03:58 +0200 Subject: [PATCH 15/15] sync submodule --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 2bea127..4b829af 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 2bea127e8113a32f216ae7a7201e36a6e7c56cc2 +Subproject commit 4b829af01672f0a7d26b1ae8b69c828905e1e3dc