pixi: Refactor pixi.toml

Author: jorisv

development/release.md

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

development/scripts/pixi/activation.bat

@@ -1,12 +1,3 @@
-:: Setup ccache
-set CMAKE_CXX_COMPILER_LAUNCHER=ccache
-
-:: Create compile_commands.json for language server
-set CMAKE_EXPORT_COMPILE_COMMANDS=1
-
-:: Activate color output with Ninja
-set CMAKE_COLOR_DIAGNOSTICS=1
-
 :: Set default build value only if not previously set
 if not defined EIGENPY_BUILD_TYPE (set EIGENPY_BUILD_TYPE=Release)
 if not defined EIGENPY_PYTHON_STUBS (set EIGENPY_PYTHON_STUBS=ON)

development/scripts/pixi/activation.sh

@@ -21,15 +21,8 @@ then
   # it allow to use clang++ as compiler
   export LDFLAGS="-Wl,-rpath,$CONDA_PREFIX/lib -Wl,-rpath-link,$CONDA_PREFIX/lib -L$CONDA_PREFIX/lib"
 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 EIGENPY_CXX_FLAGS="$CXXFLAGS -isystem $CONDA_PREFIX/include"
 
 # Set default build value only if not previously set
 export EIGENPY_BUILD_TYPE=${EIGENPY_BUILD_TYPE:=Release}

development/scripts/pixi/activation_clang.sh

@@ -21,29 +21,43 @@ numpy = ">=1.22.0"
 python = ">=3.9.0"
 scipy = ">=1.10.0"
 
-[activation]
-scripts = ["development/scripts//pixi/activation.sh"]
+[target.unix.activation]
+scripts = ["development/scripts/pixi/activation.sh"]
 
 [target.win-64.activation]
-scripts = ["development/scripts//pixi/activation.bat"]
+scripts = ["development/scripts/pixi/activation.bat"]
+
+[activation.env]
+# Setup ccache
+CMAKE_CXX_COMPILER_LAUNCHER = "ccache"
+# Create compile_commands.json for language server
+CMAKE_EXPORT_COMPILE_COMMANDS = "ON"
+# Activate color output with Ninja
+CMAKE_COLOR_DIAGNOSTICS = "ON"
 
 [tasks]
 # We must avoid to set CMAKE_CXX_FLAGS because of WIN32
 # https://discourse.cmake.org/t/strictly-appending-to-cmake-lang-flags/6478
-configure = { cmd = [
+configure = { args = [
+  { arg = "build_dir", default = "build" },
+  { arg = "build_type", default = "$EIGENPY_BUILD_TYPE" },
+  { arg = "python_stubs", default = "$EIGENPY_PYTHON_STUBS" },
+  { arg = "cholmod_support", default = "$EIGENPY_CHOLMOD_SUPPORT" },
+  { arg = "accelerate_support", default = "$EIGENPY_ACCELERATE_SUPPORT" },
+], cmd = [
   "CXXFLAGS=$EIGENPY_CXX_FLAGS",
   "cmake",
   "-G",
   "Ninja",
   "-B",
-  "build",
+  "{{ build_dir }}",
   "-S",
   ".",
   "-DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX",
-  "-DCMAKE_BUILD_TYPE=$EIGENPY_BUILD_TYPE",
-  "-DGENERATE_PYTHON_STUBS=$EIGENPY_PYTHON_STUBS",
-  "-DBUILD_WITH_CHOLMOD_SUPPORT=$EIGENPY_CHOLMOD_SUPPORT",
-  "-DBUILD_WITH_ACCELERATE_SUPPORT=$EIGENPY_ACCELERATE_SUPPORT",
+  "-DCMAKE_BUILD_TYPE={{ build_type }}",
+  "-DGENERATE_PYTHON_STUBS={{ python_stubs }}",
+  "-DBUILD_WITH_CHOLMOD_SUPPORT={{ cholmod_support }}",
+  "-DBUILD_WITH_ACCELERATE_SUPPORT={{ accelerate_support }}",
 ] }
 build = { cmd = "cmake --build build --target all", depends-on = ["configure"] }
 clean = { cmd = "rm -rf build" }
@@ -60,23 +74,14 @@ tasks = { lint = { cmd = "pre-commit run --all" } }
 tomlkit = ">=0.13.2"
 
 [feature.new-version.tasks]
-configure_new_version = { cmd = [
-  "CXXFLAGS=$EIGENPY_CXX_FLAGS",
-  "cmake",
-  "-G",
-  "Ninja",
-  "-B",
-  "build_new_version",
-  "-S",
-  ".",
-  "-DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX",
-  "-DCMAKE_BUILD_TYPE=$EIGENPY_BUILD_TYPE",
-  "-DGENERATE_PYTHON_STUBS=ON",
-  "-DBUILD_WITH_CHOLMOD_SUPPORT=ON",
-  "-DBUILD_WITH_ACCELERATE_SUPPORT=OFF",
-] }
-release_new_version = { cmd = "VERSION=$EIGENPY_VERSION cmake --build build_new_version --target release", depends-on = [
-  "configure_new_version",
+release-new-version = { cmd = "VERSION=$EIGENPY_VERSION cmake --build build_new_version --target release", depends-on = [
+  { task = "configure", args = [
+    { build_type = "Release" },
+    { build_directory = "build_new_version" },
+    { python_stubs = "ON" },
+    { accelerate_support = "OFF" },
+    { cholmod_support = "ON" },
+  ] },
 ] }
 
 # Cholmod support
@@ -95,19 +100,16 @@ python = "3.14.*"
 [feature.python-oldest.dependencies]
 python = "3.10.*"
 
-# Use clang-cl on Windows.
-# We must use scripts instead of env to setup CC and CXX
-# to avoid cxx-compiler to overwrite them.
+# Use clang-cl on Windows
 [feature.clang-cl]
 platforms = ["win-64"]
-activation = { scripts = ["development/scripts//pixi/activation_clang_cl.bat"] }
+activation = { env = { CC = "clang-cl", CXX = "clang-cl" } }
+dependencies = { clangxx = "*" }
 
-# Use clang on GNU/Linux.
-# We must use scripts instead of env to setup CC and CXX
-# to avoid cxx-compiler to overwrite them.
+# Use clang on GNU/Linux
 [feature.clang]
 platforms = ["linux-64"]
-activation = { scripts = ["development/scripts//pixi/activation_clang.sh"] }
+activation = { env = { CC = "clang", CXX = "clang++" } }
 dependencies = { clangxx = "*" }
 
 [environments]