Skip to content

Commit 3fff56b

Browse files
authored
Merge pull request #603 from jorisv/topic/python-310
Update pixi.toml
2 parents e47f6f0 + 936eb09 commit 3fff56b

File tree

14 files changed

+1524
-995
lines changed

14 files changed

+1524
-995
lines changed

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

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,22 @@ concurrency:
2727

2828
jobs:
2929
eigenpy-pixi:
30-
name: ${{ matrix.os }} - Env ${{ matrix.environment }} ${{ matrix.build_type }} ${{ matrix.cxx_options }} ${{ matrix.compiler }}
30+
name: Standard - ${{ matrix.os }} - Env ${{ matrix.environment }} ${{ matrix.build_type }} ${{ matrix.cxx_options }} ${{ matrix.compiler }}
3131
runs-on: ${{ matrix.os }}
3232
env:
3333
CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
3434
CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
3535
CCACHE_COMPRESS: true
3636
CCACHE_COMPRESSLEVEL: 6
37+
# Since pixi will install a compiler, the compiler mtime will be changed.
38+
# This can invalidate the cache (https://ccache.dev/manual/latest.html#config_compiler_check)
39+
CCACHE_COMPILERCHECK: content
3740

3841
strategy:
3942
fail-fast: false
4043
matrix:
4144
os: [ubuntu-latest, macos-latest, macos-15-intel]
42-
environment: [all, all-py39]
45+
environment: [all, all-python-oldest]
4346
build_type: [Release, Debug]
4447
cxx_options: ['', '-mavx2']
4548

@@ -75,6 +78,10 @@ jobs:
7578
cache: true
7679
environments: ${{ matrix.environment }}
7780

81+
- name: Clear ccache statistics [MacOS/Linux/Windows]
82+
run: |
83+
pixi run -e ${{ matrix.environment }} ccache -z
84+
7885
- name: Build EigenPy [MacOS/Linux/Windows]
7986
env:
8087
CMAKE_BUILD_PARALLEL_LEVEL: 2
@@ -83,6 +90,35 @@ jobs:
8390
run: |
8491
pixi run -e ${{ matrix.environment }} test
8592
93+
- name: Show ccache statistics [MacOS/Linux/Windows]
94+
run: |
95+
pixi run -e ${{ matrix.environment }} ccache -sv
96+
97+
eigenpy-pixi-build:
98+
name: Pixi build - ${{ matrix.os }}
99+
runs-on: ${{ matrix.os }}
100+
101+
strategy:
102+
fail-fast: false
103+
matrix:
104+
os: [ubuntu-latest, macos-latest, macos-15-intel, windows-latest]
105+
106+
steps:
107+
- uses: actions/checkout@v5
108+
with:
109+
submodules: recursive
110+
111+
- uses: prefix-dev/[email protected]
112+
env:
113+
CMAKE_BUILD_PARALLEL_LEVEL: 2
114+
with:
115+
cache: true
116+
environments: test-pixi-build
117+
118+
- name: Test package [MacOS/Linux/Windows]
119+
run: |
120+
pixi run -e test-pixi-build test
121+
86122
check:
87123
if: always()
88124
name: check-macos-linux-windows-pixi

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
99
### Changed
1010
- Remove `accelerate.hpp` header that clash with Accelerate.hpp in non case sensitive OS ([#593](https://github.com/stack-of-tasks/eigenpy/pull/593)
1111
We don't consider it an API break since this header was rarely used.
12+
- Python version update ([#603](https://github.com/stack-of-tasks/eigenpy/pull/603)):
13+
- Project is now tested with Python 3.10 and 3.14
14+
- Python 3.10 is the minimal supported Python version
1215

1316
### Added
1417
- Support for Python slice, tuple and list indexing for `std::vector` bindings ([#592](https://github.com/stack-of-tasks/eigenpy/pull/592))
1518
- ROS: jrl_cmakmodules dependency + kilted CI ([#602](https://github.com/stack-of-tasks/eigenpy/pull/602))
19+
- Add pixi-build support ([#603](https://github.com/stack-of-tasks/eigenpy/pull/603)):
1620

1721
### Fixed
1822
- Fix partly the support of the change of API of GeneralizedEigenSolver in Eigen 5+ ([#594](https://github.com/stack-of-tasks/eigenpy/pull/594))
1923
- Fix Eigen decompositions and solvers for Eigen 5 ([#596](https://github.com/stack-of-tasks/eigenpy/pull/596))
24+
- Remove pixi 0.57 warnings ([#603](https://github.com/stack-of-tasks/eigenpy/pull/603)):
2025

2126
## [3.12.0] - 2025-08-12
2227

development/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
To create a release with Pixi run the following commands on the **devel** branch:
44

55
```bash
6-
EIGENPY_VERSION=X.Y.Z pixi run release_new_version
6+
EIGENPY_VERSION=X.Y.Z pixi run release-new-version
77
git push origin
88
git push origin vX.Y.Z
99
```

development/scripts/pixi/activation.bat

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
:: Setup ccache
2-
set CMAKE_CXX_COMPILER_LAUNCHER=ccache
3-
4-
:: Create compile_commands.json for language server
5-
set CMAKE_EXPORT_COMPILE_COMMANDS=1
6-
7-
:: Activate color output with Ninja
8-
set CMAKE_COLOR_DIAGNOSTICS=1
9-
101
:: Set default build value only if not previously set
112
if not defined EIGENPY_BUILD_TYPE (set EIGENPY_BUILD_TYPE=Release)
123
if not defined EIGENPY_PYTHON_STUBS (set EIGENPY_PYTHON_STUBS=ON)

development/scripts/pixi/activation.sh

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,12 @@ then
2020
# On GNU/Linux, I don't know if these flags are mandatory with g++ but
2121
# it allow to use clang++ as compiler
2222
export LDFLAGS="-Wl,-rpath,$CONDA_PREFIX/lib -Wl,-rpath-link,$CONDA_PREFIX/lib -L$CONDA_PREFIX/lib"
23+
# Conda compiler is named x86_64-conda-linux-gnu-c++, ccache can't resolve it
24+
# (https://ccache.dev/manual/latest.html#config_compiler_type)
25+
export CCACHE_COMPILERTYPE=gcc
2326
fi
24-
25-
# Setup ccache
26-
export CMAKE_CXX_COMPILER_LAUNCHER=ccache
27-
28-
# Create compile_commands.json for language server
29-
export CMAKE_EXPORT_COMPILE_COMMANDS=1
30-
31-
# Activate color output with Ninja
32-
export CMAKE_COLOR_DIAGNOSTICS=1
27+
# Without -isystem, some LSP can't find headers
28+
export EIGENPY_CXX_FLAGS="$CXXFLAGS -isystem $CONDA_PREFIX/include"
3329

3430
# Set default build value only if not previously set
3531
export EIGENPY_BUILD_TYPE=${EIGENPY_BUILD_TYPE:=Release}

development/scripts/pixi/activation_clang.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

development/scripts/pixi/activation_clang_cl.bat

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)