Fix Python wheels auto versioning (#29)

* Catch2 tests moved under the flag BUILD_TESTING and are OFF be default

* fix: setup.py manually enable versioneer

* fix: add sort_by option to versioneer

* fix: git add safe directory for linux build

* fix: checkout v1

* fix: rename publish wheel step

---------

Co-authored-by: Aleksei Panchenko <nosmokingsurfer@gmail.com>
Co-authored-by: Arthur_Ch <56088401+ArthurChains@users.noreply.github.com>

Author: achains

.github/workflows/wheels.yml

@@ -27,6 +27,7 @@ jobs:
             cmake -S $PWD -B $PWD/build \
              -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$PWD/bin \
              -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$PWD/lib \
+             -DBUILD_TESTING=TRUE \
             && cmake --build build -j $(nproc)  
 
       - name: C++ unit tests
@@ -55,6 +56,9 @@ jobs:
         run: |
             env pybin=$(LANG=C ls -d1r /opt/python/cp3*/bin | head -n 1) bash -c '$pybin/python -m pip install cmake && mkdir -p /usr/local/bin && ln -svf $pybin/cmake /usr/local/bin/cmake'
             cmake --version
+      
+      - name: Add git safe directory
+        run: git config --global --add safe.directory /__w/mrob/mrob
 
       - name: Build Python wheel
         run: scripts/build-wheel-linux.sh
@@ -202,7 +206,7 @@ jobs:
 
 
   publish_pypi:
-    name: Publish macOS wheel to PyPI
+    name: Publish wheels to PyPI
     needs: test_wheel
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
@@ -219,7 +223,7 @@ jobs:
 
 
   publish-github-release:
-    name: Publish macOS wheel to GitHub Releases
+    name: Publish wheels to GitHub Releases
     needs: test_wheel
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest

.gitignore

@@ -27,3 +27,5 @@ __pycache__
 
 dist/
 mrob.egg-info/
+mrob/
+wheelhouse/

CMakeLists.txt

@@ -28,14 +28,19 @@ ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 ELSE()
 ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 
+# BUILD_TESTING option handling. By default tests are turned off but the value is cached and can be changed in Cmake-GUI
+set(BUILD_TESTING false CACHE BOOL "Build unit tests for MROB modules")
+
+MESSAGE(STATUS "Build Tests: ${BUILD_TESTING}")
+
 IF(ANDROID)
-    SET(BUILD_TESTING OFF)
+    SET(BUILD_TESTING false)
 ELSE(ANDROID)
-    SET(BUILD_TESTING ON)
-    enable_testing()
+    IF(BUILD_TESTING)
+        enable_testing()
+    ENDIF(BUILD_TESTING)
 ENDIF(ANDROID)
 
-MESSAGE(STATUS "Build Tests: ${BUILD_TESTING}")
 
 # ===================================================================
 INCLUDE_DIRECTORIES(SYSTEM ./external/Eigen)

setup.py

@@ -37,6 +37,7 @@ def finalize_options(self):
 
         def get_tag(self):
             python, abi, plat = _bdist_wheel.get_tag(self)
+            print(f"BDIST PY,ABI,PLAT: {python}, {abi}, {plat}") 
             if platform.system() == "Darwin":
                 python, abi = 'py3', 'none'
                 name = plat[:plat.find("_")]
@@ -56,6 +57,10 @@ def get_tag(self):
     bdist_wheel = None
 
 setuptools.setup(
-    setup_requires=['setuptools-git-versioning'],
+    setuptools_git_versioning={
+        "enabled": True,
+        "sort_by": "creatordate",
+    },
+    setup_requires=['setuptools-git-versioning<2'],
     cmdclass={'bdist_wheel': bdist_wheel}
 )

src/geometry/CMakeLists.txt

@@ -1,6 +1,5 @@
 # locate the additional necessary dependencies, if any
 
-
 # extra source files
 SET(sources
     SO3.cpp
@@ -16,25 +15,9 @@ SET(headers
 )
 
 # create the shared library
-ADD_LIBRARY(SE3 SHARED  ${sources})
-#TARGET_LINK_LIBRARIES( .. )
-#target_link_libraries(${PROJECT_NAME} ${position_3d_LIBRARY})
-
-
-#install 
-#INSTALL(TARGETS people_prediction
-#        RUNTIME DESTINATION bin
-#        LIBRARY DESTINATION lib/SE3
-#        ARCHIVE DESTINATION lib/SE3)
-
-#INSTALL(FILES ${headers} DESTINATION include/iridrivers/people_prediction)
-#INSTALL(FILES ${headers_random} DESTINATION include/iridrivers/people_prediction/random)
-#INSTALL(FILES ${headers_scene_elements} DESTINATION include/iridrivers/people_prediction/scene_elements)
-#INSTALL(FILES ${headers_nav} DESTINATION include/iridrivers/people_prediction/nav)
-
-
-#INSTALL(FILES ../Findpeople_prediction.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
-
+ADD_LIBRARY(SE3 SHARED ${sources})
 
-ADD_SUBDIRECTORY(examples)
-#ADD_SUBDIRECTORY(test)
+# build tests if enabled
+IF(BUILD_TESTING)
+    ADD_SUBDIRECTORY(tests)
+ENDIF(BUILD_TESTING)

src/geometry/examples/CMakeLists.txt

@@ -0,0 +1,9 @@
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/external/Catch2/single_include/)
+
+ADD_EXECUTABLE(test_SE3 test_SE3.cpp)
+TARGET_LINK_LIBRARIES(test_SE3 SE3)
+ADD_TEST(NAME test_SE3 COMMAND $<TARGET_FILE:test_SE3>)
+
+ADD_EXECUTABLE(test_SE3cov test_SE3cov.cpp)
+TARGET_LINK_LIBRARIES(test_SE3cov SE3)
+ADD_TEST(NAME test_SE3cov COMMAND $<TARGET_FILE:test_SE3cov>)