Merge branch 'master' into pr_addsfeaturessplib3

SofaDefrost · Mar 19, 2024 · 0b6810d · 0b6810d
2 parents afee021 + b667c7c
commit 0b6810d
Show file tree

Hide file tree

Showing 69 changed files with 34 additions and 20,301 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, macos-11, windows-2019]
-        sofa_branch: [master, v22.12]
+        sofa_branch: [master]
 
     steps:
       - name: Setup SOFA and environment
@@ -106,7 +106,7 @@ jobs:
           echo "RELEASE_DATE=$RELEASE_DATE" | tee -a $GITHUB_ENV
 
       - name: Delete old release
-        uses: dev-drprasad/delete-tag-and-release@v0.2.0
+        uses: dev-drprasad/delete-tag-and-release@v0.2.1
         with:
           tag_name: ${{ env.RELEASE_TAGNAME }}
           delete_release: true
@@ -119,7 +119,8 @@ jobs:
         with:
           name: ${{ env.RELEASE_NAME }}
           tag_name: ${{ env.RELEASE_TAGNAME }}
-          fail_on_unmatched_files: true
+          fail_on_unmatched_files: false
+          target_commitish: ${{ env.RELEASE_NAME }}
           body: |
             Last updated on ${{ env.RELEASE_DATE }}
           files: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,9 +28,6 @@ sofa_create_package_with_targets(
 install(DIRECTORY docs DESTINATION share/sofa/${PROJECT_NAME})
 install(FILES "README.md" "LICENSE" DESTINATION .)
 
-# Install python2 scripts (macro defined in SOFA)
-sofa_install_pythonscripts(PLUGIN_NAME ${PROJECT_NAME} PYTHONSCRIPTS_SOURCE_DIR "python" PYTHONSCRIPTS_INSTALL_DIR "python")
-
 # Install python3 scripts (macro defined in SofaPython3)
 find_file(SofaPython3Tools NAMES "SofaPython3/lib/cmake/SofaPython3/SofaPython3Tools.cmake")
 if(SofaPython3Tools)

diff --git a/python/splib/__init__.py b/python/splib/__init__.py
diff --git a/python/splib/algorithms/__init__.py b/python/splib/algorithms/__init__.py
diff --git a/python/splib/animation/__init__.py b/python/splib/animation/__init__.py
diff --git a/python/splib/animation/animate.py b/python/splib/animation/animate.py
diff --git a/python/splib/animation/easing.py b/python/splib/animation/easing.py