Merge pull request #369 from Simple-Robotics/update-pixi-fields

Update pixi.toml for pixi 0.58.0

Author: ManifoldFR

.github/workflows/macos-linux-pixi.yml

@@ -27,7 +27,7 @@ concurrency:
 
 jobs:
   aligator-pixi:
-    name: ${{ matrix.os }} - Env ${{ matrix.environment }} ${{ matrix.build_type }}
+    name: Standard ${{ matrix.os }} - Env ${{ matrix.environment }} ${{ matrix.build_type }}
     runs-on: ${{ matrix.os }}
     env:
       CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, macos-15-intel]
-        environment: [all, all-py310]
+        environment: [all, all-python-oldest]
         build_type: [Release, Debug]
 
     steps:
@@ -58,6 +58,10 @@ jobs:
         cache: true
         environments: ${{ matrix.environment }}
 
+    - name: Clear ccache statistics
+      run: |
+        pixi run -e ${{ matrix.environment }} ccache -z
+
     - name: Build aligator
       shell: bash -l {0}
       env:
@@ -66,6 +70,35 @@ jobs:
       run: |
         pixi run -e ${{ matrix.environment }} test
 
+    - name: Show ccache statistics
+      run: |
+        pixi run -e ${{ matrix.environment }} ccache -sv
+
+  aligator-pixi-build:
+    name: Pixi build - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, macos-15-intel]
+
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        submodules: recursive
+
+    - uses: prefix-dev/[email protected]
+      env:
+        CMAKE_BUILD_PARALLEL_LEVEL: 2
+      with:
+        cache: true
+        environments: test-pixi-build
+
+    - name: Test package
+      run: |
+        pixi run -e test-pixi-build test
+
   check:
     name: check-macos-linux-pixi
 

.gitlab-ci.yml

@@ -5,7 +5,7 @@ ci:
   submodules: true
 repos:
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v21.1.1
+    rev: v21.1.2
     hooks:
     - id: clang-format
       types_or: []
@@ -29,13 +29,13 @@ repos:
             )$
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.13.0'
+    rev: 'v0.14.2'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/BlankSpruce/gersemi
-    rev: 0.22.2
+    rev: 0.22.3
     hooks:
       - id: gersemi
   - repo: https://github.com/Lucas-C/pre-commit-hooks

.pre-commit-config.yaml

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- pixi: add pixi-build (preview support) (https://github.com/Simple-Robotics/aligator/pull/369)
 - gar/blk-matrix : added `BlkMatrix::isApprox()` (https://github.com/Simple-Robotics/aligator/pull/366)
 - core : added [mimalloc](https://github.com/mimalloc/mimalloc)-based memory resource (https://github.com/Simple-Robotics/aligator/pull/366)
 - modelling/costs : add getter and setter for cost term weights (https://github.com/Simple-Robotics/aligator/pull/359)
@@ -19,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- python : do not import utils.plotting automatically (https://github.com/Simple-Robotics/aligator/pull/369)
+- ci: display ccache statistics (https://github.com/Simple-Robotics/aligator/pull/369)
+- pixi: update environments (https://github.com/Simple-Robotics/aligator/pull/369)
 - move header `<aligator/gar/blk-matrix.hpp>` to `<aligator/core/blk-matrix>`
 - solver-proxddp : make new `mimalloc` memory resource the allocator resource for ProxDDP solver (https://github.com/Simple-Robotics/aligator/pull/367)
 - tests/gar/block-matrix.cpp : test against BunchKaufman factorization

CHANGELOG.md

@@ -1 +0,0 @@
-from . import plotting

bindings/python/aligator/utils/__init__.py

@@ -20,16 +20,10 @@ 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"
+  export CCACHE_COMPILERTYPE=gcc
 fi
-
-# Setup ccache
-export CMAKE_CXX_COMPILER_LAUNCHER=ccache
-
-# Create compile_commands.json for language server
-export CMAKE_EXPORT_COMPILE_COMMANDS=1
-
-# Activate color output with Ninja
-export CMAKE_COLOR_DIAGNOSTICS=1
+# Without -isystem, some LSP can't find headers
+export ALIGATOR_CXX_FLAGS="$CXXFLAGS -isystem $CONDA_PREFIX/include"
 
 # Set default build value only if not previously set
 export ALIGATOR_BUILD_TYPE=${ALIGATOR_BUILD_TYPE:=Release}

development/pixi/activation.sh

@@ -3,7 +3,7 @@
 To create a release with Pixi run the following commands on the **main** branch:
 
 ```bash
-ALIGATOR_VERSION=X.Y.Z pixi run release_new_version
+ALIGATOR_VERSION=X.Y.Z pixi run release-new-version
 git push origin
 git push origin vX.Y.Z
 ```