Merge branch 'master' into 202507_add_example_contactforce

Author: hugtalbot

.github/workflows/build_sphinx_documentation.yml

@@ -61,6 +61,22 @@ jobs:
           mkdir build/
           sphinx-build -b html -a -E source/ build/
 
+      - name: Fix JS file
+        continue-on-error: true
+        run: |
+          # Define the file path
+          FILE="docs/sphinx/build/_static/js/theme.js"
+          
+          # Check if the file exists
+          if [[ -f "$FILE" ]]; then
+            # Use sed to perform the replacement in-place
+            sed -i 's/\.wy-menu-vertical ul/\.wy-menu-vertical li > ul/g' "$FILE"
+            echo "Replacement done in $FILE"
+          else
+            echo "File not found: $FILE"
+            exit 1
+          fi
+
       - name: Zip Documentation
         run: |
           # Create a zip file of the documentation

.github/workflows/ci.yml

@@ -224,12 +224,15 @@ jobs:
           binary_status=$([ '${{ steps.gen-artifact.outcome }}' == 'success' ] && \
                          [ '${{ steps.install-artifact.outcome }}' == 'success' ] && \
                          echo 'true' || echo 'false')
+
+          os=$(echo "${{ matrix.os }}" | awk -F- '{ print $1 }')
                         
 
           curl -X POST -H "X-API-KEY: $DASH_AUTH" -H "Content-Type: application/json" -d \
           "{\"id\":\"$(echo "${{ github.repository }}" | awk -F/ '{ print $2 }')\",\
            \"github_ref\":\"${{ github.sha }}\",\
            \"url\":\"https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}\",\
+           \"os\":\"$os\",\
            \"build\":$build_status,\
            \"tests\":$test_status,\
            \"binary\":$binary_status}"\

.readthedocs.yml

@@ -13,8 +13,8 @@ build:
   os: "ubuntu-22.04"
   commands:
     - mkdir --parents $READTHEDOCS_OUTPUT/html/
-    - wget https://github.com/sofa-framework/SofaPython3/releases/download/v24.12.00-doc-generation/SofaPython3_v24.12.00_docs.zip
+    - wget https://github.com/sofa-framework/SofaPython3/releases/download/v25.06.00-doc-generation/SofaPython3_v25.06.00_docs.zip
     - mkdir docUnzipped/
-    - unzip  SofaPython3_v24.12.00_docs.zip -d docUnzipped/
-    - cp --recursive docUnzipped/SofaPython3_v24.12.00_docs/* $READTHEDOCS_OUTPUT/html/
+    - unzip  SofaPython3_v25.06.00_docs.zip -d docUnzipped/
+    - cp --recursive docUnzipped/SofaPython3_v25.06.00_docs/* $READTHEDOCS_OUTPUT/html/
     - ls $READTHEDOCS_OUTPUT/html/

SofaPython3Config.cmake.in

@@ -9,12 +9,16 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 include(SofaPython3Tools)
 
 # Find Python3
-if(NOT Python_FOUND)
-    find_package(Python @PythonMAJMIN@ EXACT QUIET REQUIRED COMPONENTS Interpreter Development)
+if(NOT TARGET Python::Python)
+    if(CMAKE_VERSION VERSION_LESS "3.24.0") 
+        find_package(Python @PythonMAJMIN@ EXACT QUIET REQUIRED COMPONENTS Interpreter Development)
+    else()
+        find_package(Python @PythonMAJMIN@ EXACT QUIET REQUIRED COMPONENTS Interpreter Development GLOBAL)
+    endif()
 endif()
 
 # Find pybind11
-if(NOT pybind11_FOUND)
+if(NOT TARGET pybind11)
     # Save PYTHON_* vars
     set(PYTHON_VERSION_RESET "${PYTHON_VERSION}")
     set(PYTHON_EXECUTABLE_RESET "${PYTHON_EXECUTABLE}")
@@ -40,7 +44,11 @@ if(NOT pybind11_FOUND)
         set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE)
     endif()
 
-    find_package(pybind11 @pybind11_VERSION@ QUIET REQUIRED CONFIG)
+    if(CMAKE_VERSION VERSION_LESS "3.24.0") 
+        find_package(pybind11 @pybind11_VERSION@ QUIET REQUIRED CONFIG)
+    else()
+        find_package(pybind11 @pybind11_VERSION@ QUIET REQUIRED CONFIG GLOBAL)
+    endif()
 
     # Reset PYTHON_* vars
     set(PYTHON_VERSION "${PYTHON_VERSION_RESET}" CACHE STRING "" FORCE)

bindings/BindingsConfig.cmake.in

@@ -5,15 +5,17 @@
 
 set(SP3_WITH_SOFAEXPORTER @SP3_WITH_SOFAEXPORTER@)
 
-find_package(SofaPython3 QUIET REQUIRED COMPONENTS
+find_package(Sofa.Config QUIET REQUIRED)
+
+sofa_find_package(SofaPython3 QUIET REQUIRED COMPONENTS
     Bindings.Modules
     Bindings.Sofa
     Bindings.SofaGui
     Bindings.SofaRuntime
     Bindings.SofaTypes
     )
 if(SP3_WITH_SOFAEXPORTER)
-    find_package(SofaPython3 QUIET REQUIRED COMPONENTS Bindings.SofaExporter)
+    sofa_find_package(SofaPython3 QUIET REQUIRED COMPONENTS Bindings.SofaExporter)
 endif()
 
 # If we are importing this config file and the target is not yet there this is indicating that

bindings/Modules/Bindings.ModulesConfig.cmake.in

@@ -3,16 +3,17 @@
 @PACKAGE_GUARD@
 @PACKAGE_INIT@
 
-find_package(SofaPython3 QUIET REQUIRED COMPONENTS Plugin Bindings.Sofa)
+find_package(Sofa.Config QUIET REQUIRED)
+sofa_find_package(SofaPython3 QUIET REQUIRED COMPONENTS Plugin Bindings.Sofa)
 
 # Required by Bindings.Modules.SofaBaseTopology
-find_package(Sofa.Component.Topology.Container.Grid QUIET REQUIRED)
+sofa_find_package(Sofa.Component.Topology.Container.Grid QUIET REQUIRED)
 
 # Required by Bindings.Modules.SofaDeformable
-find_package(Sofa.Component.SolidMechanics.Spring QUIET REQUIRED)
+sofa_find_package(Sofa.Component.SolidMechanics.Spring QUIET REQUIRED)
 
 # Required by Bindings.Modules.SofaLinearSolver
-find_package(Sofa.Component.LinearSolver.Iterative QUIET REQUIRED)
+sofa_find_package(Sofa.Component.LinearSolver.Iterative QUIET REQUIRED)
 
 # If we are importing this config file and the target is not yet there this is indicating that
 # target is an imported one. So we include it

bindings/Sofa/Bindings.SofaConfig.cmake.in

@@ -3,21 +3,23 @@
 @PACKAGE_GUARD@
 @PACKAGE_INIT@
 
-find_package(SofaPython3 QUIET REQUIRED COMPONENTS Plugin)
+find_package(Sofa.Config QUIET REQUIRED)
+
+sofa_find_package(SofaPython3 QUIET REQUIRED COMPONENTS Plugin)
 
 # Required by Bindings.Sofa.Helper, Bindings.Sofa.Types
-find_package(Sofa.Core QUIET REQUIRED)
+sofa_find_package(Sofa.Core QUIET REQUIRED)
 
 # Required by Bindings.Sofa.Core
-find_package(Sofa.Simulation.Core QUIET REQUIRED)
+sofa_find_package(Sofa.Simulation.Core QUIET REQUIRED)
 
 # Required by Bindings.Sofa.Core
-find_package(Sofa.Component.Visual QUIET REQUIRED)
-find_package(Sofa.Component.Collision.Response.Contact QUIET REQUIRED)
-find_package(Sofa.SimpleApi QUIET REQUIRED)
+sofa_find_package(Sofa.Component.Visual QUIET REQUIRED)
+sofa_find_package(Sofa.Component.Collision.Response.Contact QUIET REQUIRED)
+sofa_find_package(Sofa.SimpleApi QUIET REQUIRED)
 
 # Required by Bindings.Sofa.Simulation
-find_package(Sofa.Simulation.Graph QUIET REQUIRED)
+sofa_find_package(Sofa.Simulation.Graph QUIET REQUIRED)
 
 # If we are importing this config file and the target is not yet there this is indicating that
 # target is an imported one. So we include it

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.cpp

@@ -112,9 +112,13 @@ std::unique_ptr<DataContainerContext> writeableArray(BaseData* self)
     return nullptr;
 }
 
-void __setattr__(py::object self, const std::string& s, py::object value)
+py::object getValue(py::object self)
+{
+    return PythonFactory::valueToPython_ro(py::cast<BaseData*>(self));
+}
+
+void setValue(py::object self, py::object value)
 {
-    SOFA_UNUSED(s);
     BaseData* selfdata = py::cast<BaseData*>(self);
 
     if(py::isinstance<DataContainer>(value))
@@ -132,14 +136,20 @@ void __setattr__(py::object self, const std::string& s, py::object value)
     BindingBase::SetAttr(py::cast(selfdata->getOwner()),selfdata->getName(),value);
 }
 
+void __setattr__(py::object self, const std::string& s, py::object value)
+{
+    SOFA_UNUSED(s);
+    setValue(self, value);
+}
+
 py::object __getattr__(py::object self, const std::string& s)
 {
     /// If this is data.value we returns the content value of the data field converted into
     /// a python object that is easy to manipulate. The conversion is done with the toPython
     /// function.
     if(s == "value")
     {
-        return PythonFactory::valueToPython_ro(py::cast<BaseData*>(self));
+        return getValue(self);
     }
 
     if(s == "linkpath")
@@ -150,6 +160,8 @@ py::object __getattr__(py::object self, const std::string& s)
     throw py::attribute_error("There is no attribute '"+s+"'");
 }
 
+
+
 void setParent(BaseData* self, BaseData* parent)
 {
     self->setParent(parent);
@@ -211,6 +223,8 @@ void moduleAddBaseData(py::module& m)
     data.def("getName", [](BaseData& b){ return b.getName(); }, sofapython3::doc::baseData::getName);
     data.def("setName", [](BaseData& b, const std::string& s){ b.setName(s); }, sofapython3::doc::baseData::setName);
     data.def("getCounter", [](BaseData& self) { return self.getCounter(); }, sofapython3::doc::baseData::getCounter);
+    data.def("setValue", setValue);
+    data.def("getValue", getValue);
     data.def("getHelp", &BaseData::getHelp, sofapython3::doc::baseData::getHelp);
     data.def("unset", [](BaseData& b){ b.unset(); }, sofapython3::doc::baseData::unset);
     data.def("getOwner", &getOwner, sofapython3::doc::baseData::getOwner);

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_LinkPath.cpp

@@ -24,6 +24,8 @@ using sofa::core::objectmodel::BaseLink;
 #include <sofa/core/objectmodel/BaseObject.h>
 using  sofa::core::objectmodel::BaseObject;
 
+#include <SofaPython3/PythonFactory.h>
+
 #include <SofaPython3/Sofa/Core/Binding_LinkPath.h>
 #include <SofaPython3/Sofa/Core/Binding_LinkPath_doc.h>
 
@@ -79,6 +81,13 @@ void moduleAddLinkPath(py::module& m)
     py::class_<LinkPath> link(m, "LinkPath", sofapython3::doc::linkpath::linkpath);
     link.def("__str__", &__str__);
     link.def("__repr__", &__repr__);
+    link.def("target", [](const LinkPath& entry) -> py::object{
+        if(entry.targetData != nullptr)
+            return PythonFactory::toPython(entry.targetData);
+        else if(entry.targetBase.get() != nullptr)
+            return PythonFactory::toPython(entry.targetBase.get());
+        return py::none();
+    });
 }
 
 }/// namespace sofapython3