Merge pull request #129 from jrl-umi3218/pre-commit-ci-update-config

Author: ThomasDuvinage

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, windows-latest]
+        os: [ubuntu-22.04, ubuntu-24.04, macos-latest, windows-latest]
         build-type: [Debug, RelWithDebInfo]
         compiler: [gcc, clang]
         exclude:
@@ -28,12 +28,6 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
-    - name: Install pip for Python 2 (Ubuntu 20.04)
-      run: |
-        curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py
-        sudo python2 get-pip.py
-        rm -f get-pip.py
-      if: matrix.os == 'ubuntu-20.04'
     - name: Install dependencies
       uses: jrl-umi3218/github-actions/install-dependencies@master
       with:
@@ -42,8 +36,7 @@ jobs:
         ubuntu: |
           apt: cython cython3 python-numpy python3-numpy python-pytest python3-pytest python-coverage python3-coverage python-setuptools python3-setuptools libeigen3-dev doxygen doxygen-latex libboost-all-dev libtinyxml2-dev libyaml-cpp-dev
         macos: |
-          cask: gfortran
-          brew: eigen boost tinyxml2 yaml-cpp
+          brew: eigen boost tinyxml2 yaml-cpp gcc
           pip: Cython coverage numpy pytest
         windows: |
           pip: Cython coverage numpy pytest
@@ -68,7 +61,7 @@ jobs:
         windows-options: -DPYTHON_BINDING:BOOL=OFF
     - name: Upload documentation
       # Only run on master branch and for one configuration
-      if: matrix.os == 'ubuntu-20.04' && matrix.build-type == 'RelWithDebInfo' && matrix.compiler == 'gcc' && github.ref == 'refs/heads/master'
+      if: matrix.os == 'ubuntu-24.04' && matrix.build-type == 'RelWithDebInfo' && matrix.compiler == 'gcc' && github.ref == 'refs/heads/master'
       uses: jrl-umi3218/github-actions/upload-documentation@master
       with:
         GH_USER: gergondet

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
   - id: check-useless-excludes
   - id: check-hooks-apply
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v21.1.5
+  rev: v21.1.6
   hooks:
   - id: clang-format
 - repo: https://github.com/pre-commit/pre-commit-hooks

CMakeLists.txt

@@ -56,9 +56,9 @@ find_package(RBDyn_TinyXML2 REQUIRED)")
     add_project_dependency(tinyxml2 REQUIRED NO_MODULE)
   endif()
 
-  # Note: technically we don't need system but it is likely to be here and CMake
-  # <= 3.5.0 needs at least one component to define Boost::boost
-  add_project_dependency(Boost REQUIRED COMPONENTS system)
+  # Note: technically we don't need filesystem but it is likely to be here and
+  # CMake <= 3.5.0 needs at least one component to define Boost::boost
+  add_project_dependency(Boost REQUIRED COMPONENTS filesystem)
 endif()
 
 # For MSVC, set local environment variable to enable finding the built dll of

src/RBDyn/CoM.cpp

@@ -2,6 +2,8 @@
  * Copyright 2012-2019 CNRS-UM LIRMM, CNRS-AIST JRL
  */
 
+#include <cassert>
+
 // associated header
 #include "RBDyn/CoM.h"
 

src/RBDyn/IS.cpp

@@ -2,6 +2,7 @@
  * Copyright 2012-2019 CNRS-UM LIRMM, CNRS-AIST JRL
  */
 
+#include <cassert>
 #include <iostream>
 
 // associated header

src/RBDyn/Jacobian.cpp

@@ -6,6 +6,7 @@
 #include "RBDyn/Jacobian.h"
 
 // includes
+#include <cassert>
 // std
 #include <algorithm>
 #include <numeric>

tests/CMakeLists.txt

@@ -4,16 +4,16 @@
 
 enable_testing()
 
-find_package(Boost REQUIRED COMPONENTS unit_test_framework system filesystem)
+find_package(Boost REQUIRED COMPONENTS unit_test_framework filesystem)
 
 set(HEADERS XXXarm.h XYZarm.h XYZSarm.h Tree30Dof.h SSSarm.h)
 
 macro(addUnitTest name)
   if(${BUILD_TESTING})
     add_executable(${name} ${name}.cpp ${HEADERS})
     target_link_libraries(
-      ${name} PRIVATE RBDyn Boost::unit_test_framework Boost::system
-                      Boost::filesystem Boost::disable_autolinking)
+      ${name} PRIVATE RBDyn Boost::unit_test_framework Boost::filesystem
+                      Boost::disable_autolinking)
     target_compile_definitions(
       ${name} PRIVATE -DBOOST_TEST_DYN_LINK
                       -DTESTS_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
@@ -27,8 +27,8 @@ macro(addParserUnitTest name)
   if(${BUILD_TESTING} AND ${BUILD_RBDYN_PARSERS})
     add_executable(${name} ${name}.cpp ${HEADERS})
     target_link_libraries(
-      ${name} PRIVATE RBDynParsers Boost::unit_test_framework Boost::system
-                      Boost::filesystem Boost::disable_autolinking)
+      ${name} PRIVATE RBDynParsers Boost::unit_test_framework Boost::filesystem
+                      Boost::disable_autolinking)
     target_compile_definitions(
       ${name} PRIVATE -DBOOST_TEST_DYN_LINK
                       -DTESTS_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}")

tests/InverseStaticsTest.cpp

@@ -10,8 +10,8 @@
 
 // boost
 #define BOOST_TEST_MODULE Statics
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp>
+#include <boost/test/tools/output_test_stream.hpp>
+#include <boost/test/unit_test.hpp>
 
 // SpaceVecAlg
 #include <SpaceVecAlg/SpaceVecAlg>