Merge pull request #128 from zivid/fix-ci-april2021

Fix CI April2021
zivid · Apr 27, 2021 · a9e56bf · a9e56bf
2 parents 5f64d70 + dd4e88b
commit a9e56bf
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/continuous-integration/deployment/expected-version.txt b/continuous-integration/deployment/expected-version.txt
@@ -1 +1 @@
-2.1.1.2.3.0
+2.1.2.2.3.0
diff --git a/continuous-integration/linux/platform-dependent/fedora-30/setup.sh b/continuous-integration/linux/platform-dependent/fedora-30/setup.sh
@@ -15,7 +15,7 @@ dnf --assumeyes install \
 alternatives --install /usr/bin/python python /usr/bin/python3 0 || exit $?
 alternatives --install /usr/bin/pip pip /usr/bin/pip3 0 || exit $?
 
-source "$SCRIPT_DIR/../common.sh" || exit $?
+source $(realpath $SCRIPT_DIR/../common.sh) || exit $?
 # Install OpenCL CPU runtime driver prerequisites
 dnf --assumeyes install \
     numactl-libs \

diff --git a/continuous-integration/linux/platform-dependent/fedora-33/setup.sh b/continuous-integration/linux/platform-dependent/fedora-33/setup.sh
@@ -15,7 +15,7 @@ dnf --assumeyes install \
 alternatives --install /usr/bin/python python /usr/bin/python3 0 || exit $?
 alternatives --install /usr/bin/pip pip /usr/bin/pip3 0 || exit $?
 
-source "$SCRIPT_DIR/../common.sh" || exit $?
+source $(realpath $SCRIPT_DIR/../common.sh) || exit $?
 # Install OpenCL CPU runtime driver prerequisites
 dnf --assumeyes install \
     numactl-libs \

diff --git a/continuous-integration/linux/platform-dependent/ubuntu-18.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-18.04/setup.sh
@@ -22,7 +22,7 @@ apt-yes install \
 update-alternatives --install /usr/bin/python python /usr/bin/python3 0 || exit $?
 update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 0 || exit $?
 
-source "$SCRIPT_DIR/../common.sh" || exit $?
+source $(realpath $SCRIPT_DIR/../common.sh) || exit $?
 # Install OpenCL CPU runtime driver prerequisites
 apt-yes install libnuma-dev lsb-core || exit $?
 install_opencl_cpu_runtime || exit $?

diff --git a/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh b/continuous-integration/linux/platform-dependent/ubuntu-20.04/setup.sh
@@ -22,7 +22,7 @@ apt-yes install \
 update-alternatives --install /usr/bin/python python /usr/bin/python3 0 || exit $?
 update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 0 || exit $?
 
-source "$SCRIPT_DIR/../common.sh" || exit $?
+source $(realpath $SCRIPT_DIR/../common.sh) || exit $?
 # Install OpenCL CPU runtime driver prerequisites
 apt-yes install libnuma-dev lsb-core || exit $?
 install_opencl_cpu_runtime || exit $?

diff --git a/continuous-integration/python-requirements/build.txt b/continuous-integration/python-requirements/build.txt
@@ -1,4 +1,4 @@
 scikit-build==0.11.1
 cmake==3.18.4.post1
 ninja==1.10.0.post2
-conan==1.32.1
+conan==1.35.2
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 # To be replaced by: from setuptools_scm import get_version
 def get_version():
-    return "2.1.1"
+    return "2.1.2"
 
 
 def _zivid_sdk_version():

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -28,7 +28,12 @@ file(GLOB_RECURSE HEADERS
     "${CMAKE_CURRENT_BINARY_DIR}/include/*h"
 )
 
-add_library(${PROJECT_NAME} MODULE ${SOURCES} ${HEADERS})
+python3_add_library(
+        ${PROJECT_NAME}
+        MODULE
+        WITH_SOABI
+        ${SOURCES}
+    )
 
 target_include_directories(${PROJECT_NAME}
     PRIVATE include
@@ -42,10 +47,4 @@ target_link_libraries(${PROJECT_NAME}
             CONAN_PKG::Eigen3
 )
 
-set_target_properties(${PROJECT_NAME}
-    PROPERTIES	
-        PREFIX "${PYTHON_MODULE_PREFIX}"	
-        SUFFIX "${PYTHON_MODULE_EXTENSION}"	
-)
-
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION modules/${PROJECT_NAME})