merge dev; fix conflicts

Author: alphaville

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 ## Main Changes
 
-- Describe main changes
+Give a summary of the key changes
 
 
 ## Associated Issues
@@ -9,10 +9,23 @@
 - Addresses #2
 
 
-## TODOs
+## Merge Dependencies
 
-- [ ] Documentation 
-- [ ] All tests must pass
+Either: 
+- This PR has no merge dependencies, or
+- Depends on: ..., or
+- Should be merged before: ...
+
+## Target versions
+
+- OpEn version ...
+- opengen version ...
+
+
+## Checklist
+
+- [ ] API documentation updated
+- [ ] Appropriate testing
 - [ ] Update `CHANGELOG`(s)
-- [ ] Update webpage documentation
-- [ ] Bump versions (in `CHANGELOG`, `Cargo.toml` and `VERSION`)
+- [ ] Update webpage documentation, if necessary
+- [ ] Bump versions (in `CHANGELOG`, `Cargo.toml` and `VERSION`), if necessary

.github/workflows/ci.yml

@@ -1,100 +1,135 @@
+name: Continuous integration
+
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
 
-name: Continuous integration
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  ci:
+  rust_tests:
+    name: Rust tests (${{ matrix.name }})
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        include:
+          - name: Linux
+            os: ubuntu-latest
+          - name: macOS
+            os: macos-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          rustflags: ""
+
+      - name: Cargo tests
+        run: cargo test
+
+      - name: Cargo tests (RP and JEM)
+        run: |
+          cargo test --features rp
+          cargo test --features jem
+
+  python_tests:
+    name: Python tests (${{ matrix.name }})
+    needs: rust_tests
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Linux
+            os: ubuntu-latest
+            skip_rpi_test: 0
+          - name: macOS
+            os: macos-latest
+            skip_rpi_test: 1
     env:
       DO_DOCKER: 0
+      SKIP_RPI_TEST: ${{ matrix.skip_rpi_test }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: egor-tensin/setup-clang@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v5
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-      - uses: actions/setup-python@v5
+          components: clippy
+          rustflags: ""
+
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
-          architecture: 'x64'
+          python-version: "3.12"
+          cache: "pip"
+          cache-dependency-path: open-codegen/setup.py
+
+      - uses: egor-tensin/setup-clang@v1
+        if: runner.os == 'Linux'
+
+      - name: Install Linux ARM target
+        if: runner.os == 'Linux'
+        run: rustup target add arm-unknown-linux-gnueabihf
+
       - name: Install ARM cross-compiler and C libraries
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
-          # If icasadi_rosenbrock or other deps need C++:
-          # sudo apt-get install -y g++-arm-linux-gnueabihf
-      - name: Cargo tests (RP and JEM)
-        run: |
-          cargo test --features rp
-          cargo test --features jem
-      - name: Run tests (script.sh)
-        # Set environment variables for the cc crate
+
+      - name: Install LLVM
+        if: runner.os == 'macOS'
+        run: brew install llvm
+
+      - name: Run Python tests and generated Clippy checks
+        if: runner.os == 'Linux'
         env:
           CC_arm_unknown_linux_gnueabihf: arm-linux-gnueabihf-gcc
           AR_arm_unknown_linux_gnueabihf: arm-linux-gnueabihf-ar
-          # If C++ is involved and you installed g++-arm-linux-gnueabihf:
-          # CXX_arm_unknown_linux_gnueabihf: arm-linux-gnueabihf-g++
-        run: |          
-          bash ./ci/script.sh
+        run: bash ./ci/script.sh python-tests
 
-  ci_macos:
+      - name: Run Python tests and generated Clippy checks
+        if: runner.os == 'macOS'
+        run: bash ./ci/script.sh python-tests
+
+  ocp_tests:
+    name: OCP tests (${{ matrix.name }})
+    needs: python_tests
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
     strategy:
+      fail-fast: false
       matrix:
-        os: [macos-latest]
+        include:
+          - name: Linux
+            os: ubuntu-latest
+          - name: macOS
+            os: macos-latest
     env:
       DO_DOCKER: 0
     steps:
-      - uses: actions/checkout@v2
-      - run: brew install llvm
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v5
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-      - uses: actions/setup-python@v5
+          rustflags: ""
+
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
-      - run: cargo test --features rp
-      - run: cargo test --features jem
-      - name: Install ARM cross-compiler toolchain (via Homebrew)
-        run: |
-          # Tap the repository that provides the cross-compiler
-          brew tap messense/macos-cross-toolchains
-          # Update brew to ensure the tap is recognized (can sometimes be needed)
-          brew update 
-          # Install the full toolchain (includes gcc, binutils, sysroot)
-          # This specific formula provides the entire toolchain.
-          brew install arm-unknown-linux-gnueabihf 
-          
-          # The above `brew install` might have linking conflicts if other partial
-          # toolchains were somehow pre-installed or installed by other steps.
-          # If it fails with link errors, you might need:
-          # brew link --overwrite arm-unknown-linux-gnueabihf
-
-          # Verify the compiler is found
-          which arm-linux-gnueabihf-gcc || (echo "arm-linux-gnueabihf-gcc not found in PATH" && exit 1)
-      - name: Run tests (script.sh)
-        # Set environment variables for the cc crate and PyO3 (if needed)
-        env:
-          CC_arm_unknown_linux_gnueabihf: arm-linux-gnueabihf-gcc
-          AR_arm_unknown_linux_gnueabihf: arm-linux-gnueabihf-ar
-          # If you are building PyO3 bindings and need to specify Python libs from the sysroot:
-          # PYO3_CROSS_LIB_DIR: "/opt/homebrew/opt/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot/usr/lib" # Adjust path and Python version
-          # PYO3_CROSS_INCLUDE_DIR: "/opt/homebrew/opt/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot/usr/include/python3.x" # Adjust path and Python version
-        run: |
-          bash ./ci/script.sh
+          python-version: "3.12"
+          cache: "pip"
+          cache-dependency-path: open-codegen/setup.py
+
+      - name: Run OCP Python tests
+        run: bash ./ci/script.sh ocp-tests

.gitignore

@@ -43,6 +43,7 @@ open-clib/Cargo.lock
 /website/node_modules/
 /website/yarn.lock
 /website/build/
+/website/.docusaurus/
 !/website/pages/
 !/website/static/
 !/website/*.js
@@ -73,3 +74,4 @@ open-clib/Cargo.lock
 *private*
 .DS_Store
 /img/
+private/

CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Note: This is the main Changelog file for the Rust solver. The Changelog file for the Python interface (`opengen`) can be found in [/open-codegen/CHANGELOG.md](open-codegen/CHANGELOG.md)
 
+
+<!-- ---------------------
+      v0.12.0
+     --------------------- -->
+## [v0.12.0] - Unreleased
+
+
+### Changed
+
+- Rust solver supports generic float types
+- Expanded Rust constraint test coverage with constructor validation, boundary/idempotence checks, and additional `BallP` / epigraph projection cases
+
+
+<!-- ---------------------
+      v0.11.1
+     --------------------- -->
+## [v0.11.1] - 2026-03-23 
+
+
+### Fixed
+
+- Return best PANOC half-step on early exit (issue #325)
+
+
 <!-- ---------------------
       v0.11.0
      --------------------- -->
@@ -330,6 +354,7 @@ This is a breaking API change.
      --------------------- -->
 
 <!-- Releases -->
+[v0.11.1]: https://github.com/alphaville/optimization-engine/compare/v0.11.0...v0.11.1
 [v0.11.0]: https://github.com/alphaville/optimization-engine/compare/v0.10.0...v0.11.0
 [v0.10.0]: https://github.com/alphaville/optimization-engine/compare/v0.9.1...v0.10.0
 [v0.9.1]: https://github.com/alphaville/optimization-engine/compare/v0.9.0...v0.9.1

Cargo.toml

@@ -42,7 +42,7 @@ homepage = "https://alphaville.github.io/optimization-engine/"
 repository = "https://github.com/alphaville/optimization-engine"
 
 # Version of this crate (SemVer)
-version = "0.11.0"
+version = "0.12.0-alpha.1"
 
 edition = "2018"