From 137c389c7f0bfb2865448169b0509538282cd607 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 30 Sep 2026 17:42:02 +0200 Subject: [PATCH 1/3] pixi: Fix migration to cxx-compiler > 2 conda compiler doesn't rely on environment variable anymore --- development/scripts/pixi/activation.sh | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/development/scripts/pixi/activation.sh b/development/scripts/pixi/activation.sh index e1add68..00e2145 100644 --- a/development/scripts/pixi/activation.sh +++ b/development/scripts/pixi/activation.sh @@ -1,30 +1,14 @@ #! /bin/bash -# Remove flags setup from cxx-compiler -unset CFLAGS -unset CPPFLAGS -unset CXXFLAGS -unset DEBUG_CFLAGS -unset DEBUG_CPPFLAGS -unset DEBUG_CXXFLAGS -unset LDFLAGS -if [[ $host_alias == *"apple"* ]]; +if [[ $PIXI_ENVIRONMENT_PLATFORMS == *"linux"* ]]; then - # On OSX setting the rpath and -L it's important to use the conda libc++ instead of the system one. - # If conda-forge use install_name_tool to package some libs, -headerpad_max_install_names is then mandatory - export LDFLAGS="-Wl,-headerpad_max_install_names -Wl,-rpath,$CONDA_PREFIX/lib -L$CONDA_PREFIX/lib" -elif [[ $host_alias == *"linux"* ]]; -then - # On GNU/Linux, I don't know if these flags are mandatory with g++ but - # it allow to use clang++ as compiler - export LDFLAGS="-Wl,-rpath,$CONDA_PREFIX/lib -Wl,-rpath-link,$CONDA_PREFIX/lib -L$CONDA_PREFIX/lib" - # Conda compiler is named x86_64-conda-linux-gnu-c++, ccache can't resolve it # (https://ccache.dev/manual/latest.html#config_compiler_type) export CCACHE_COMPILERTYPE=gcc fi + # Without -isystem, some LSP can't find headers -export LOIK_CXX_FLAGS="$CXXFLAGS $LOIK_CXX_FLAGS -isystem $CONDA_PREFIX/include" +export LOIK_CXX_FLAGS="$LOIK_CXX_FLAGS -isystem $CONDA_PREFIX/include" # Set default build value only if not previously set export LOIK_BUILD_TYPE=${LOIK_BUILD_TYPE:=Release} From a179aece13031f952bc9d1e2e842cfee98414741 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 30 Sep 2026 17:43:27 +0200 Subject: [PATCH 2/3] dev: Move contributing.md to the root --- development/contributing.md => CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename development/contributing.md => CONTRIBUTING.md (95%) diff --git a/development/contributing.md b/CONTRIBUTING.md similarity index 95% rename from development/contributing.md rename to CONTRIBUTING.md index bd718fd..86c42fc 100644 --- a/development/contributing.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ Whether it's a bug report, a new feature, a fix, or documentation, we value ever Read this document before opening an issue or a pull request. -All communication on this project must follow the [Code of Conduct](../CODE_OF_CONDUCT.md). +All communication on this project must follow the [Code of Conduct](CODE_OF_CONDUCT.md). ## Table of contents @@ -62,7 +62,7 @@ If an issue meets these criteria, claim it with a short comment. ### Set up the development environment -The easiest way to set up a development environment is to use pixi, as described in the [build documentation](build.md). +The easiest way to set up a development environment is to use pixi, as described in the [build documentation](development/build.md). See the CI workflows for examples with other package managers. @@ -79,7 +79,7 @@ In your pull request: - Keep it to a single self-contained change. Don't mix unrelated fixes. - Keep backward compatibility. Don't break the API. - Write tests that cover your changes. -- Add an entry to the [changelog](../CHANGELOG.md). +- Add an entry to the [changelog](CHANGELOG.md). - Make sure code style checks pass (`pixi run lint` or `pre-commit run --all-files`). - Make sure the CI is green. Ask for help if you're stuck on a CI issue. - Check all the appropriate items in the pull request template checklist. @@ -112,7 +112,7 @@ ctest --test-dir build --output-on-failure -R ### Code style -Code style is enforced with [pre-commit](https://pre-commit.com/) hooks configured in [.pre-commit-config.yaml](../.pre-commit-config.yaml). +Code style is enforced with [pre-commit](https://pre-commit.com/) hooks configured in [.pre-commit-config.yaml](.pre-commit-config.yaml). Before pushing your changes, run: ```bash @@ -181,4 +181,4 @@ It breaks the responsibility and communication rules. ## Licensing -All contributions to this repository are under the BSD 2-Clause License, as stated in [LICENSE](../LICENSE). +All contributions to this repository are under the BSD 2-Clause License, as stated in [LICENSE](LICENSE). From 52d2505c7c7111ee22e4f95e4be67a2e6f4a5021 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 30 Sep 2026 17:46:26 +0200 Subject: [PATCH 3/3] repo: Link to the moved CONTRIBUTING.md --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 +++- .github/ISSUE_TEMPLATE/feature_request.yml | 4 +++- .github/pull_request_template.md | 4 ++-- README.md | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 2063a0e..8521d1e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -7,7 +7,7 @@ body: - type: markdown attributes: value: | - Follow the [contributing guidelines](../../development/contributing.md). + Follow the [contributing guidelines](https://github.com/Simple-Robotics/LoIK/blob/devel/CONTRIBUTING.md). If you have a question about how to use LoIK, open a [discussion](https://github.com/Simple-Robotics/LoIK/discussions). @@ -58,6 +58,8 @@ body: attributes: label: Checklist options: + - label: I have read the [contributing guidelines](https://github.com/Simple-Robotics/LoIK/blob/devel/CONTRIBUTING.md) + required: true - label: I have checked that all my packages are installed from the same package manager (conda-forge, Nix, PyPI, robotpkg, ROS, ...) required: true - label: I have checked that there is no similar [issue](https://github.com/Simple-Robotics/LoIK/issues)/[discussion](https://github.com/Simple-Robotics/LoIK/discussions) diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 4e044bd..45f1f5d 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -7,7 +7,7 @@ body: - type: markdown attributes: value: | - Follow the [contributing guidelines](../../development/contributing.md). + Follow the [contributing guidelines](https://github.com/Simple-Robotics/LoIK/blob/devel/CONTRIBUTING.md). If you have a question about how to use LoIK, open a [discussion](https://github.com/Simple-Robotics/LoIK/discussions). @@ -43,6 +43,8 @@ body: attributes: label: Checklist options: + - label: I have read the [contributing guidelines](https://github.com/Simple-Robotics/LoIK/blob/devel/CONTRIBUTING.md) + required: true - label: I have checked that there is no similar [issue](https://github.com/Simple-Robotics/LoIK/issues)/[discussion](https://github.com/Simple-Robotics/LoIK/discussions) in the repo required: true diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 88e5780..d32a87c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,5 @@ ## Description @@ -13,7 +13,7 @@ If the pull request fixes an issue, link it with "Fixes #issue_number". ## Checklist -- [ ] I have read the [contributing guidelines](../development/contributing.md) +- [ ] I have read the [contributing guidelines](https://github.com/Simple-Robotics/LoIK/blob/devel/CONTRIBUTING.md) - [ ] I have run `pre-commit run --all-files` or `pixi run lint` - [ ] I have reviewed my own code - [ ] I have commented my code where necessary diff --git a/README.md b/README.md index a85f244..4d742ec 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ Please also consider citing the reference paper for the **LoIK** algorithm: ## Contribution -If you want to ask a question, report a bug, request a new feature or contributing with a pull requests please, follow the [contribution guideline](./development/contributing.md). +If you want to ask a question, report a bug, request a new feature or contributing with a pull requests please, follow the [contribution guideline](./contributing.md). ## Core-dev team