From 97ada0083ce8119eb422ffda7835857bb366aa4c Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Tue, 9 Jul 2024 15:10:30 +0200 Subject: [PATCH 1/8] pre-commit: Don't autofix PR and update quarterly --- .pre-commit-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c90e326da..0d8a7a798 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,7 @@ ci: autoupdate_branch: devel + autofix_prs: false + autoupdate_schedule: quarterly repos: - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.1.14 From b9a382ab047ca9bc596d44ac7c8359622b640450 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 24 Jun 2024 18:04:53 +0000 Subject: [PATCH 2/8] Switch to the system dependency for octomap. This ensures that we have a consistent ABI between this package that uses octomap, and anything else in the system that might use it. We'll eventually be remove the octomap that we currently have vendored within ROS itself so we can ensure this. Signed-off-by: Chris Lalancette --- package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.xml b/package.xml index 55418801b..592e5c72d 100644 --- a/package.xml +++ b/package.xml @@ -28,7 +28,7 @@ eigen boost assimp - octomap + liboctomap-dev eigenpy From 4788277fb55bd4572266fb4d651b4207c9fb7c0d Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Wed, 24 Jul 2024 17:31:29 +0200 Subject: [PATCH 3/8] changelog: sync --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f2da580c..c2687d45d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Fixed +- Fix Octomap dependency on ROS + ## [2.4.4] - 2024-03-06 ## [2.4.3] - 2024-03-06 From 82f33ac88dbee9058709edaebd6b6847cac801b6 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 28 Jul 2024 19:12:02 +0200 Subject: [PATCH 4/8] ci/conda: add missing qhull-static --- .github/workflows/conda/conda-env.yml | 2 +- .github/workflows/macos-linux-conda.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda/conda-env.yml b/.github/workflows/conda/conda-env.yml index 54d08f514..12e847a58 100644 --- a/.github/workflows/conda/conda-env.yml +++ b/.github/workflows/conda/conda-env.yml @@ -13,4 +13,4 @@ dependencies: - doxygen - lxml - pylatexenc - - qhull + - qhull \ No newline at end of file diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index e4145419f..f0b9fd492 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -30,14 +30,14 @@ jobs: shell: bash -l {0} run: | conda activate hpp-fcl - conda install compilers=1.4.2 -c conda-forge + conda install compilers -c conda-forge - name: Install cmake and update conda shell: bash -l {0} run: | conda activate hpp-fcl conda install cmake -c main - conda install llvm-openmp -c conda-forge + conda install llvm-openmp qhull-static -c conda-forge - name: Build hpp-fcl shell: bash -l {0} From 900a0ec3adc5b95b0c66cca64a7605226f1e774a Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 28 Jul 2024 19:33:43 +0200 Subject: [PATCH 5/8] ci/conda: update actions --- .github/workflows/macos-linux-conda.yml | 4 ++-- .github/workflows/windows-conda-clang.yml | 4 ++-- .github/workflows/windows-conda-v142.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index f0b9fd492..304456ce3 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -14,11 +14,11 @@ jobs: python-version: ["3.8", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: activate-environment: hpp-fcl auto-update-conda: true diff --git a/.github/workflows/windows-conda-clang.yml b/.github/workflows/windows-conda-clang.yml index 22c27a61f..d716b80d3 100644 --- a/.github/workflows/windows-conda-clang.yml +++ b/.github/workflows/windows-conda-clang.yml @@ -15,10 +15,10 @@ jobs: compiler: clang-cl steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' with: diff --git a/.github/workflows/windows-conda-v142.yml b/.github/workflows/windows-conda-v142.yml index 6b183034f..8916146db 100644 --- a/.github/workflows/windows-conda-v142.yml +++ b/.github/workflows/windows-conda-v142.yml @@ -14,10 +14,10 @@ jobs: os: windows-2019 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' with: From 9a9a489c7b6111ba996f97c02545244144ac1d8c Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 28 Jul 2024 22:49:17 +0200 Subject: [PATCH 6/8] release: Update package.xml version to 2.4.5 --- package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.xml b/package.xml index 592e5c72d..3489edfdc 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ hpp-fcl - 2.4.4 + 2.4.5 An extension of the Flexible Collision Library. From b52c10bb423b7b682a1c2c4ae037cda6bcf390ce Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Sun, 28 Jul 2024 22:49:18 +0200 Subject: [PATCH 7/8] release: Update CHANGELOG.md for 2.4.5 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2687d45d..e9b683c47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +## [2.4.5] - 2024-07-28 + ### Fixed - Fix Octomap dependency on ROS @@ -457,7 +459,8 @@ Now Eigen is at the heart of linear algebra computations. First release -[Unreleased]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.4...HEAD +[Unreleased]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.5...HEAD +[2.4.5]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.4...v2.4.5 [2.4.4]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.3...v2.4.4 [2.4.3]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.2...v2.4.3 [2.4.2]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.1...v2.4.2 From 984bf07af1adc91dd84767b8400b1a690a65d4e0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 11 Jul 2024 11:33:19 +0200 Subject: [PATCH 8/8] Nix --- .github/workflows/nix.yml | 19 +++++++++++++ flake.lock | 57 +++++++++++++++++++++++++++++++++++++++ flake.nix | 42 +++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 .github/workflows/nix.yml create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml new file mode 100644 index 000000000..52b45d9f0 --- /dev/null +++ b/.github/workflows/nix.yml @@ -0,0 +1,19 @@ +name: "CI - Nix" + +on: + push: + +jobs: + nix: + runs-on: "${{ matrix.os }}-latest" + strategy: + matrix: + os: [ubuntu, macos] + steps: + - uses: actions/checkout@v4 + - 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 new file mode 100644 index 000000000..5a0734589 --- /dev/null +++ b/flake.lock @@ -0,0 +1,57 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1724857063, + "narHash": "sha256-Hr4qs3NQLP6JDUPpItJOztUzsr3IjC9WAWM47ob03GU=", + "owner": "gepetto", + "repo": "nixpkgs", + "rev": "b953c287a7ed9e5d33917ec4c838e1b5de9713e0", + "type": "github" + }, + "original": { + "owner": "gepetto", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..6ebaad615 --- /dev/null +++ b/flake.nix @@ -0,0 +1,42 @@ +{ + description = "An extension of the Flexible Collision Library"; + + inputs = { + flake-parts.url = "github:hercules-ci/flake-parts"; + #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # use gepetto fork until https://github.com/NixOS/nixpkgs/pull/337549 + nixpkgs.url = "github:gepetto/nixpkgs"; + }; + + outputs = + inputs: + inputs.flake-parts.lib.mkFlake { inherit inputs; } { + systems = inputs.nixpkgs.lib.systems.flakeExposed; + perSystem = + { pkgs, self', ... }: + { + apps.default = { + type = "app"; + program = pkgs.python3.withPackages (_: [ self'.packages.default ]); + }; + devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; }; + packages = { + default = self'.packages.hpp-fcl; + hpp-fcl = pkgs.python3Packages.hpp-fcl.overrideAttrs (_: { + src = pkgs.lib.fileset.toSource { + root = ./.; + fileset = pkgs.lib.fileset.unions [ + ./CMakeLists.txt + ./doc + ./include + ./package.xml + ./python + ./src + ./test + ]; + }; + }); + }; + }; + }; +}