Adds slight improvements to build, conan and CI scripts.

Author: nyibbang

ci/cibuildwheel_before_all.sh ci/cibuildwheel_linux_before_all.shci/cibuildwheel_before_all.sh renamed to ci/cibuildwheel_linux_before_all.sh

@@ -12,26 +12,19 @@ yum install -y perl-IPC-Cmd perl-Digest-SHA
 conan config install "$PACKAGE/ci/conan"
 
 # Clone and export libqi to Conan cache.
-# Possible improvement:
-#   Avoid duplicating the version number here with the version
-#   defined in conanfile.py.
+QI_VERSION=$(sed -nE '/^\s*requires\s*=/,/^\s*]/{ s/\s*"qi\/([^"]+)"/\1/p }' "$PACKAGE/conanfile.py")
+
 GIT_SSL_NO_VERIFY=true \
     git clone --depth=1 \
-        --branch qi-framework-v4.0.1 \
+        --branch "qi-framework-v${QI_VERSION}" \
         "$LIBQI_REPOSITORY_URL" \
         /work/libqi
-conan export /work/libqi --version=4.0.1
+conan export /work/libqi --version="${QI_VERSION}"
 
 # Install dependencies of libqi-python from Conan, including libqi.
-# Only use the build_type as a variable for the build folder name, so
-# that the generated CMake preset is named "conan-release".
 #
 # Build everything from sources, so that we do not reuse precompiled binaries.
 # This is because the GLIBC from the manylinux images are often older than the
 # ones that were used to build the precompiled binaries, which means the binaries
 # cannot by executed.
-conan install "$PACKAGE" \
-    --build="*" \
-    -c tools.build:skip_test=true \
-    -c tools.cmake.cmaketoolchain:generator=Ninja \
-    -c tools.cmake.cmake_layout:build_folder_vars=[\"settings.build_type\"]
+conan install "$PACKAGE" --build="*"

ci/conan/global.conf

@@ -1,2 +1,7 @@
 core:default_profile=default
 core:default_build_profile=default
+tools.build:skip_test=true
+tools.cmake.cmaketoolchain:generator=Ninja
+# Only use the build_type as a variable for the build folder name, so
+# that the generated CMake preset is named "conan-release".
+tools.cmake.cmake_layout:build_folder_vars=["settings.build_type"]

conanfile.py

@@ -36,21 +36,22 @@
 ]
 
 USED_BOOST_COMPONENTS = [
-    "atomic",  # required by thread
-    "chrono",  # required by thread
-    "container",  # required by thread
-    "date_time",  # required by thread
-    "exception",  # required by thread
-    "filesystem",  # required by libqi
-    "locale",  # required by libqi
-    "program_options",  # required by libqi
-    "random",  # required by libqi
-    "regex",  # required by libqi
-    "system",  # required by thread
     "thread",
+    # required by libqi
+    "filesystem",
+    "locale",
+    "program_options",
+    "random",
+    "regex",
+    # required by boost.thread
+    "atomic",
+    "chrono",
+    "container",
+    "date_time",
+    "exception",
+    "system",
 ]
 
-
 class QiPythonConan(ConanFile):
     requires = [
         "boost/[~1.78]",

pyproject.toml

@@ -59,10 +59,8 @@ build-frontend = "build"
 environment-pass = ["LIBQI_REPOSITORY_URL"]
 
 [tool.cibuildwheel.linux]
-# Build using the manylinux2014 image
 manylinux-x86_64-image = "manylinux2014"
-
-before-all = ["ci/cibuildwheel_before_all.sh {package}"]
+before-all = ["ci/cibuildwheel_linux_before_all.sh {package}"]
 
 [tool.cibuildwheel.linux.config-settings]
 "cmake.args" = ["--preset=conan-release"]