From ab3ff311718f9a02b5ec153caf1408de09fea79a Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 25 Jun 2024 15:37:33 +0200 Subject: [PATCH 01/12] update for hpp-fcl v3 BVHModel now has std::shared_ptr instead of *T, for tri_indices & vertices. --- src/affordance.impl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/affordance.impl.cc b/src/affordance.impl.cc index 5ddccf0..6a698f9 100644 --- a/src/affordance.impl.cc +++ b/src/affordance.impl.cc @@ -332,11 +332,11 @@ hpp::doubleSeqSeqSeqSeq* Afford::getAffordancePoints(char const* affordance) { tris.length((CORBA::ULong)nbTris); for (std::size_t triIdx = 0; triIdx < nbTris; triIdx++) { hpp::doubleSeqSeq triangle; - const fcl::Triangle& refTri = model->tri_indices[triIdx]; + const fcl::Triangle& refTri = (*model->tri_indices)[triIdx]; triangle.length(3); for (unsigned int vertIdx = 0; vertIdx < 3; vertIdx++) { fcl::Vec3f p(affObjs[affIdx].second->fcl()->getRotation() * - model->vertices[refTri[vertIdx]] + + (*model->vertices)[refTri[vertIdx]] + affObjs[affIdx].second->fcl()->getTranslation()); hpp::doubleSeq point; // point always 3D From c52cf6454b148bd19aa9b124a53dc00b33688bbf 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:25:17 +0000 Subject: [PATCH 02/12] [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 1da7bc51bf5a8698008c22504ccc2aa89de2bf65 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 2 Jul 2024 11:13:39 +0200 Subject: [PATCH 03/12] nix: update after v5.1.0 --- flake.lock | 26 ++++++++++++-------------- flake.nix | 4 ++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 0013316..c36d471 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -30,16 +30,15 @@ ] }, "locked": { - "lastModified": 1719747792, - "narHash": "sha256-73aaDAWTnjoiOywas+kObTUu9JwMAz0dzz1wwMXjTXU=", + "lastModified": 1719770510, + "narHash": "sha256-RCpc+rNs9khy3LGKmiTuqQ8P7dJtdqAYvLU4yq9OiEU=", "owner": "humanoid-path-planner", "repo": "hpp-affordance", - "rev": "72860a95371f3d888baef9ad32a009c03ae0f0c1", + "rev": "a90f8e0e79c117f3530b8fa8c5e51412106c1da4", "type": "github" }, "original": { "owner": "humanoid-path-planner", - "ref": "release/5.1.0", "repo": "hpp-affordance", "type": "github" } @@ -87,16 +86,15 @@ ] }, "locked": { - "lastModified": 1719745070, - "narHash": "sha256-mzhI7/31RNZf8JTe3BNa34MDI4vGE0XkqmcbaeHKpBQ=", + "lastModified": 1719772432, + "narHash": "sha256-qFcBT/YDTsrAzEE//JmCbk1TnVrnYcme1WCzkPaXwZ0=", "owner": "humanoid-path-planner", "repo": "hpp-corbaserver", - "rev": "db386e9b303ee8a965821a55231cc6e46a250ae0", + "rev": "f623d8cd51e627a12e7c6f240781dd7f4a5b7ddf", "type": "github" }, "original": { "owner": "humanoid-path-planner", - "ref": "release/5.1.0", "repo": "hpp-corbaserver", "type": "github" } @@ -114,11 +112,11 @@ ] }, "locked": { - "lastModified": 1719747485, - "narHash": "sha256-Vhd0aKFp7uP/6tXDF1SpNOrhE6vKKcLlziH0xTI9Zz8=", + "lastModified": 1719586831, + "narHash": "sha256-oRFZsERQKzaW2NvgcKcxqJZtqtlk7rqDK2inhUTABiQ=", "owner": "humanoid-path-planner", "repo": "hpp-core", - "rev": "d1fb6edcf1ae00b791e67b43bc91d80516d41c28", + "rev": "733f884a03cde41aeae18758a26b28cf6fdf02fa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 346be2d..3413fe3 100644 --- a/flake.nix +++ b/flake.nix @@ -13,14 +13,14 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; hpp-affordance = { - url = "github:humanoid-path-planner/hpp-affordance/release/5.1.0"; + url = "github:humanoid-path-planner/hpp-affordance"; inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; }; }; hpp-corbaserver = { - url = "github:humanoid-path-planner/hpp-corbaserver/release/5.1.0"; + url = "github:humanoid-path-planner/hpp-corbaserver"; inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; From d24aa3331c9023947fca8b25d1be9825fda4ee43 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 2 Jul 2024 11:51:25 +0200 Subject: [PATCH 04/12] 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 0b5e75b02f04f623d187e58fc865499f72c060eb Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 4 Jul 2024 13:44:02 +0200 Subject: [PATCH 05/12] 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 59421609d3fddd99281597d1e679fae1fe9b3925 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 7 Oct 2024 16:40:40 +0200 Subject: [PATCH 06/12] nix: move package to nixpkgs --- .github/workflows/nix.yml | 18 +-- flake.lock | 293 ++------------------------------------ flake.nix | 56 +++----- 3 files changed, 39 insertions(+), 328 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 c36d471..0acc930 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -20,291 +20,18 @@ "type": "github" } }, - "hpp-affordance": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719770510, - "narHash": "sha256-RCpc+rNs9khy3LGKmiTuqQ8P7dJtdqAYvLU4yq9OiEU=", - "owner": "humanoid-path-planner", - "repo": "hpp-affordance", - "rev": "a90f8e0e79c117f3530b8fa8c5e51412106c1da4", - "type": "github" - }, - "original": { - "owner": "humanoid-path-planner", - "repo": "hpp-affordance", - "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": 1728311915, + "narHash": "sha256-sSO62Urk2Z+FD0nZedCtls1DS2i1ptym4cH9LLe9qDc=", + "owner": "gepetto", "repo": "nixpkgs", - "rev": "b81610d293fac26c2ec6a81718a979bc25f8c155", + "rev": "cd927e59d87f819ddad09b157d8c58dc7319eba5", "type": "github" }, "original": { - "owner": "nim65s", - "ref": "gepetto", + "owner": "gepetto", + "ref": "hpp", "repo": "nixpkgs", "type": "github" } @@ -312,8 +39,6 @@ "root": { "inputs": { "flake-parts": "flake-parts", - "hpp-affordance": "hpp-affordance", - "hpp-corbaserver": "hpp-corbaserver", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 3413fe3..424a3cf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,37 +1,17 @@ { description = "corbaserver to provide affordance utilities in python"; - 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/hpp"; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; - hpp-affordance = { - url = "github:humanoid-path-planner/hpp-affordance"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-parts.follows = "flake-parts"; - }; - }; - hpp-corbaserver = { - url = "github:humanoid-path-planner/hpp-corbaserver"; - inputs = { - nixpkgs.follows = "nixpkgs"; - 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" @@ -39,21 +19,27 @@ "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-affordance = inputs.hpp-affordance.packages.${system}.default; - hpp-corbaserver = inputs.hpp-corbaserver.packages.${system}.default; - }; + default = self'.packages.hpp-affordance-corba; + hpp-affordance-corba = pkgs.python3Packages.hpp-affordance-corba.overrideAttrs (_: { + src = pkgs.lib.fileset.toSource { + root = ./.; + fileset = pkgs.lib.fileset.unions [ + ./CMakeLists.txt + ./data + ./doc + ./idl + ./include + ./package.xml + ./src + ./tests + ]; + }; + }); }; - devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; }; }; }; } From bb47b805b30df8c99220afcfa746db8267aa4caa Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 7 Oct 2024 16:43:04 +0200 Subject: [PATCH 07/12] compatibility with hpp-fcl <> 3.0.0 --- src/affordance.impl.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/affordance.impl.cc b/src/affordance.impl.cc index 6a698f9..2e374c6 100644 --- a/src/affordance.impl.cc +++ b/src/affordance.impl.cc @@ -332,11 +332,19 @@ hpp::doubleSeqSeqSeqSeq* Afford::getAffordancePoints(char const* affordance) { tris.length((CORBA::ULong)nbTris); for (std::size_t triIdx = 0; triIdx < nbTris; triIdx++) { hpp::doubleSeqSeq triangle; +#if HPP_FCL_VERSION_AT_LEAST(3, 0, 0) const fcl::Triangle& refTri = (*model->tri_indices)[triIdx]; +#else + const fcl::Triangle& refTri = model->tri_indices[triIdx]; +#endif triangle.length(3); for (unsigned int vertIdx = 0; vertIdx < 3; vertIdx++) { fcl::Vec3f p(affObjs[affIdx].second->fcl()->getRotation() * +#if HPP_FCL_VERSION_AT_LEAST(3, 0, 0) (*model->vertices)[refTri[vertIdx]] + +#else + model->vertices[refTri[vertIdx]] + +#endif affObjs[affIdx].second->fcl()->getTranslation()); hpp::doubleSeq point; // point always 3D From 81f42e6d0f3147f04818f63e7c418eb36c8228de Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 7 Oct 2024 16:44:03 +0200 Subject: [PATCH 08/12] git rm default.nix --- default.nix | 54 ----------------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 default.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index e808289..0000000 --- a/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - cmake, - hpp-affordance, - hpp-corbaserver, - pkg-config, - python3Packages, -}: - -python3Packages.buildPythonPackage { - pname = "hpp-affordance-corba"; - version = "5.0.0"; - pyproject = false; - - src = lib.fileset.toSource { - root = ./.; - fileset = lib.fileset.unions [ - ./CMakeLists.txt - ./data - ./doc - ./idl - ./include - ./package.xml - ./src - ./tests - ]; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = [ - python3Packages.boost - ]; - propagatedBuildInputs = [ - hpp-affordance - hpp-corbaserver - python3Packages.omniorbpy - ]; - - enableParallelBuilding = false; - - doCheck = true; - - meta = { - description = "corbaserver to provide affordance utilities in python"; - homepage = "https://github.com/humanoid-path-planner/hpp-affordance-corba"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.nim65s ]; - }; -} From fab460e5c83bbf3e5b161a02fb3a6c794437ba56 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 7 Oct 2024 17:29:23 +0200 Subject: [PATCH 09/12] 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 8c9bf60ee612ad1078da9bba0b73b6a57c405eda Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:23:08 +0000 Subject: [PATCH 10/12] [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.6.8](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.0...v0.6.8) - [github.com/pre-commit/mirrors-clang-format: v18.1.8 → v19.1.0](https://github.com/pre-commit/mirrors-clang-format/compare/v18.1.8...v19.1.0) --- .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 8d2133d..64e618f 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.6.8 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.8 + rev: v19.1.0 hooks: - id: clang-format args: From 6341f3e6626b3686fdecbf5ef09f77d9aa01d6d5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:23:22 +0000 Subject: [PATCH 11/12] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/hpp/corbaserver/affordance/client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hpp/corbaserver/affordance/client.py b/src/hpp/corbaserver/affordance/client.py index b886423..a3e2c4e 100644 --- a/src/hpp/corbaserver/affordance/client.py +++ b/src/hpp/corbaserver/affordance/client.py @@ -17,9 +17,10 @@ import typing -from hpp.corbaserver.client import Client as _Parent from hpp_idl.hpp.corbaserver.affordance import Afford +from hpp.corbaserver.client import Client as _Parent + class Client(_Parent): """ From 65754fe5fa3948da09342aa9d399b4566f387208 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 8 Oct 2024 13:03:55 +0200 Subject: [PATCH 12/12] 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