Merge remote-tracking branch 'sofa-framework/master' into v20.12-guparan

# Conflicts:
#	Plugin/CMakeLists.txt
#	Plugin/PluginConfig.cmake.in
#	Plugin/src/SofaPython3/Prefab.cpp
#	SofaPython3Config.cmake.in
#	bindings/CMakeLists.txt
#	bindings/Sofa/tests/Core/PythonRestShapeForceField.py
#	examples/example-forcefield.py

Author: guparan

.github/workflows/macos.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Download SOFA nightly build
         run:  |
           curl --output sofa.zip -L \
-          https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries-v20.12/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/MacOS/*zip*/MacOS.zip
+          https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/MacOS/*zip*/MacOS.zip
 
       - name: Install SOFA nightly build
         run: |
@@ -108,7 +108,7 @@ jobs:
       - name: Download SOFA nightly build
         run:  |
           curl --output sofa.zip -L \
-          https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries-v20.12/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/MacOS/*zip*/MacOS.zip
+          https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/MacOS/*zip*/MacOS.zip
 
       - name: Install SOFA nightly build
         run: |

.github/workflows/ubuntu.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Download SOFA nightly build
         run:  |
           curl --output sofa.zip -L \
-          https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries-v20.12/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/Linux/*zip*/Linux.zip
+          https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/Linux/*zip*/Linux.zip
 
       - name: Install SOFA nightly build
         run:  |
@@ -123,7 +123,7 @@ jobs:
       - name: Download SOFA nightly build
         run:  |
           curl --output sofa.zip -L \
-          https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries-v20.12/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/Linux/*zip*/Linux.zip
+          https://ci.inria.fr/sofa-ci-dev/job/nightly-generate-binaries/lastSuccessfulBuild/CI_SCOPE=binaries_minimal/artifact/Linux/*zip*/Linux.zip
 
       - name: Install SOFA nightly build
         run: |

Plugin/CMakeLists.txt

@@ -24,19 +24,24 @@ set(SOURCE_FILES
 )
 
 if(SP3_BUILD_TEST)
-    list(APPEND HEADER_FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonTest.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonTestExtractor.h
-    )
-    list(APPEND SOURCE_FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonTest.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonTestExtractor.cpp
-    )
+    find_package(Sofa.Testing REQUIRED)
+    if(Sofa.Testing_FOUND)
+        list(APPEND HEADER_FILES
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonTest.h
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonTestExtractor.h
+        )
+        list(APPEND SOURCE_FILES
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonTest.cpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/SofaPython3/PythonTestExtractor.cpp
+        )
+    else()
+        message(WARNING "Sofa.Testing has not been found, SofaPython3 tests cannot be built.")
+    endif(Sofa.Testing_FOUND)
 endif(SP3_BUILD_TEST)
 
 find_package(pybind11 CONFIG REQUIRED)
 find_package(SofaFramework REQUIRED)
-find_package(SofaSimulation REQUIRED)
+find_package(SofaSimulationGraph REQUIRED)
 
 add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})
 add_library(SofaPython3::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
@@ -46,6 +51,10 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE "-DSOFA_BUILD_SOFAPYTHON3")
 target_link_libraries(${PROJECT_NAME} PUBLIC SofaCore SofaDefaultType SofaSimulationCore SofaSimulationGraph SofaHelper)
 target_link_libraries(${PROJECT_NAME} PUBLIC pybind11::module pybind11::embed)
 
+if(SP3_BUILD_TEST AND Sofa.Testing_FOUND)
+    target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Testing)
+endif()
+
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME SofaPython3)
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")

Plugin/PluginConfig.cmake.in

@@ -4,7 +4,7 @@
 
 find_package(pybind11 CONFIG REQUIRED)
 find_package(SofaFramework REQUIRED)
-find_package(SofaSimulation REQUIRED)
+find_package(SofaSimulationGraph 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

Plugin/src/SofaPython3/Prefab.cpp

@@ -43,7 +43,7 @@ using sofa::core::objectmodel::Event;
 
 void Prefab::init()
 {
-    Inherit1::init(sofa::core::ExecParams::defaultInstance());
+    Inherit1::init(sofa::core::execparams::defaultInstance());
     m_is_initialized = true;
     reinit();
 }
@@ -64,13 +64,13 @@ void Prefab::reinit()
     clearLoggedMessages();
 
     /// remove everything in the node.
-    execute<sofa::simulation::DeleteVisitor>(sofa::core::ExecParams::defaultInstance());
+    execute<sofa::simulation::DeleteVisitor>(sofa::core::execparams::defaultInstance());
 
     doReInit();
 
     /// Beurk beurk beurk
     sofa::simulation::getSimulation()->initNode(this);
-    execute<VisualInitVisitor>(nullptr);
+    execute<VisualInitVisitor>(sofa::core::execparams::defaultInstance());
 }
 
 void Prefab::doReInit()

Plugin/src/SofaPython3/PythonEnvironment.h

@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <string>
-
+#include <sofa/helper/logging/FileInfo.h>
 
 /// Fixes compile errors:
 /// removing all slots macros is necessary if embedded in a Qt project

Plugin/src/SofaPython3/PythonFactory.cpp

@@ -51,6 +51,8 @@ using sofa::core::objectmodel::MouseEvent;
 using sofa::core::objectmodel::ScriptEvent;
 using sofa::core::objectmodel::Event;
 
+#include <sofa/core/topology/Topology.h>
+
 #include <sofa/defaulttype/DataTypeInfo.h>
 
 /// Bind the python's attribute error

Plugin/src/SofaPython3/PythonTestExtractor.cpp

@@ -21,6 +21,7 @@
 #include <SofaPython3/PythonTestExtractor.h>
 #include <SofaPython3/PythonEnvironment.h>
 
+#include <sofa/helper/logging/Messaging.h>
 #include <sofa/helper/system/FileSystem.h>
 #include <sofa/helper/StringUtils.h>
 #include <sofa/helper/system/SetDirectory.h>

Plugin/src/SofaPython3/SceneLoaderPY3.cpp

@@ -24,7 +24,6 @@
 #include <SofaSimulationGraph/DAGNode.h>
 using sofa::simulation::graph::DAGNode;
 
-#include <sofa/helper/ArgumentParser.h>
 #include <SofaPython3/PythonEnvironment.h>
 #include <SofaPython3/SceneLoaderPY3.h>
 #include <SofaPython3/PythonFactory.h>
@@ -33,9 +32,11 @@ using sofa::simulation::graph::DAGNode;
 #include <pybind11/embed.h>
 namespace py = pybind11;
 
-using namespace sofa::core::objectmodel;
+#include <sofa/helper/system/SetDirectory.h>
 using sofa::helper::system::SetDirectory;
 
+using namespace sofa::core::objectmodel;
+
 MSG_REGISTER_CLASS(sofapython3::SceneLoaderPY3, "SofaPython3::SceneLoader")
 
 PYBIND11_DECLARE_HOLDER_TYPE(Base, sofa::core::sptr<Base>, true)

README.md

@@ -20,7 +20,7 @@ NB: This plugin cannot be build through in-build process when the old SofaPython
 
 ### Out-of-tree build
 This plugin should compile with out-of-tree builds.
-You might need to add the Sofa's installation path to the CMake prefix path. If you compiled Sofa in directory _$SOFA_ROOT/build_, consider doing an install step (make install, ninja install, etc.) and adding this installation path (example `cmake -DCMAKE_PREFIX_PATH=$SOFA_ROOT/build/install ..`).
+You might need to add the Sofa's installation path to the CMake prefix path. If you compiled Sofa in directory _$SOFA_ROOT/build_, consider doing an install step (make install, ninja install, etc.) and adding this installation path (example `cmake -DCMAKE_PREFIX_PATH=$SOFA_ROOT/build/install/lib/cmake ..`).
 
 ### Changing the python path
 The compilation of SofaPython3 plugin and bindings are tied to the python core library found during the CMake stage.