Hidden folder for external dependency

Author: ktsitsi

.github/workflows/build-wheels.yml

@@ -47,7 +47,7 @@ jobs:
           brew install automake pkg-config ninja llvm
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.0
+        uses: pypa/cibuildwheel@v2.23.3
         env:
           CIBW_BUILD_VERBOSITY: 3
           CIBW_ENVIRONMENT_PASS_LINUX: SETUPTOOLS_SCM_PRETEND_VERSION_FOR_TILEDB S3_BUCKET TILEDB_TOKEN TILEDB_NAMESPACE
@@ -67,6 +67,7 @@ jobs:
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: auditwheel repair {wheel} -w {dest_dir}
           # Pin auditwheel version to ensure consistent behavior
           CIBW_BEFORE_BUILD_LINUX: pip install auditwheel==6.0.0
+          CIBW_ENVIRONMENT: TILEDB_DOWNLOADED=ON
         with:
           output-dir: wheelhouse
 
@@ -77,9 +78,12 @@ jobs:
 
       - name: Test isolation
         run: |
-          auditwheel show ./wheelhouse/*.whl
-          unzip ./wheelhouse/*.whl
-
+          echo "=== Wheel audit information ==="
+          auditwheel show ./wheelhouse/*.whl || true
+          echo "=== Wheel contents ==="
+          python -m zipfile -l ./wheelhouse/*.whl | grep -E "(\.so|\.dylib|\.dll|tiledb\.libs)" || echo "No shared libraries found in wheel"
+          echo "=== Unzip wheel for detailed inspection ==="
+          unzip -l ./wheelhouse/*.whl
 
 
   build_sdist:

pyproject.toml

@@ -79,6 +79,7 @@ TILEDB_VERSION = {env="TILEDB_VERSION"}
 TILEDB_HASH = {env="TILEDB_HASH"}
 TILEDB_REMOVE_DEPRECATIONS = "OFF"
 TILEDB_SERIALIZATION = "OFF"
+TILEDB_DOWNLOADED = "ON"
 
 [tool.pytest.ini_options]
 python_classes = "*Test*"

tiledb/CMakeLists.txt

@@ -39,23 +39,15 @@ endif()
 install(TARGETS main DESTINATION tiledb)
 
 if(TILEDB_DOWNLOADED)
-    if(BUILD_WHEEL)
-        message(STATUS "Wheel build: skipping install of libtiledb.so (auditwheel will vendor it)")
-    else()
-        message(STATUS "System install: installing libtiledb.so into package")
-        install(IMPORTED_RUNTIME_ARTIFACTS TileDB::tiledb_shared DESTINATION tiledb)
-    endif()
+    message(STATUS "System install: installing libtiledb.so into hidden folder")
+    install(IMPORTED_RUNTIME_ARTIFACTS TileDB::tiledb_shared DESTINATION tiledb.libs/)
 
     if (APPLE)
-        set_target_properties(main PROPERTIES INSTALL_RPATH "@loader_path")
+        set_target_properties(main PROPERTIES INSTALL_RPATH "@loader_path/../tiledb.libs")
     elseif(UNIX)
-        set_target_properties(main PROPERTIES INSTALL_RPATH "\$ORIGIN")
+        set_target_properties(main PROPERTIES INSTALL_RPATH "\$ORIGIN/../tiledb.libs")
     endif()
 
-    get_property(TILEDB_LOCATION TARGET TileDB::tiledb_shared PROPERTY LOCATION)
-    get_filename_component(TILEDB_LOCATION ${TILEDB_LOCATION} DIRECTORY)
-    message(STATUS "Setting RPATH for targets \"main\" and \"libtiledb\" to ${TILEDB_LOCATION}")
-    set_target_properties(main PROPERTIES INSTALL_RPATH ${TILEDB_LOCATION})
 else()
     # If using external TileDB core library force it to be linked at runtime using RPATH
     get_property(TILEDB_LOCATION TARGET TileDB::tiledb_shared PROPERTY LOCATION)