Merge pull request #412 from unum-cloud/release-pre-release-correctio…

…ns-builds-tests-warnings-docs

Release pre release corrections builds tests warnings docs

CMakeLists.txt

@@ -162,19 +162,25 @@ endif()
 
 if(${USE_CONAN})
   # Engines:
-  include_directories(CONAN_INCLUDE_DIRS_LEVELDB)
-  set(LIB_LEVELDB ${CONAN_LIBS_LEVELDB})
-  include_directories(CONAN_INCLUDE_DIRS_ROCKSDB)
-  set(LIB_ROCKSDB ${CONAN_LIBS_ROCKSDB})
+  if(${USTORE_BUILD_ENGINE_LEVELDB})
+    include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/leveldb.cmake")
+    set(LIB_LEVELDB leveldb)
+  endif()
+
+  if(${USTORE_BUILD_ENGINE_ROCKSDB})
+    include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/rocksdb.cmake")
+    set(LIB_ROCKSDB rocksdb)
+  endif()
 
   # Modalities:  
-  include_directories(${CONAN_INCLUDE_DIRS_FMT})
+  # include_directories(${CONAN_INCLUDE_DIRS_FMT})
   include_directories(${CONAN_INCLUDE_DIRS_JSON})
   include_directories(${CONAN_INCLUDE_DIRS_BSON})
   include_directories(${CONAN_INCLUDE_DIRS_YYJSON})
   include_directories(${CONAN_INCLUDE_DIRS_SIMDJSON})
   include_directories(${CONAN_INCLUDE_DIRS_PCRE2})
 
+  include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/fmt.cmake")
   include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/mpack.cmake")
 
   if(${USTORE_USE_JEMALLOC})
@@ -318,7 +324,7 @@ if(${USE_CONAN})
   set(LIB_SSL ssl)
   set(LIB_CRYPTO crypto)
 
-  set(LIB_FMT fmt)
+  set(LIB_FMT fmt::fmt)
   set(LIB_BSON bson-static-1.0) 
   set(LIB_PCRE2 pcre2-8)
 else()

pyproject.toml

@@ -26,17 +26,17 @@ before-build = [
     "pip install pyarrow==10.0.1 auditwheel",
     "export PYST=$(python -c 'import site; print(site.getsitepackages()[0])')",
     # Install dependency using conan
-    # "pip install cmake conan==1.60.1",
-    # "conan profile new --detect default",
-    # "conan profile update settings.compiler=gcc default",
-    # "conan profile update settings.compiler.version=10 default",
-    # "conan profile update settings.compiler.libcxx=libstdc++11 default",
-
-    # "wget -q https://github.com/gurgenyegoryan/ustore-conan/releases/download/v0.1.9/ustore_deps_x86_linux.tar.gz",
-    # "tar -xzvf {project}/ustore_deps_x86_linux.tar.gz -C ~/.conan",
-    # "conan install ustore_deps/0.12.1@unum/x86_linux -g cmake",
-    # "rm -rf {project}/ustore_deps_x86_linux.tar.gz",
+    "pip install cmake conan==1.60.1",
+    "conan profile new --detect default",
+    "conan profile update settings.compiler=gcc default",
+    "conan profile update settings.compiler.version=11 default",
+    "conan profile update settings.compiler.libcxx=libstdc++11 default",
 
+    "wget -q https://github.com/unum-cloud/ustore-deps/releases/download/v0.1.3/ustore_deps_x86_linux.tar.gz",
+    "tar -xzvf {project}/ustore_deps_x86_linux.tar.gz -C ~/.conan",
+    "conan install ustore_deps/0.12.1@unum/x86_linux -g cmake",
+    "rm -rf {project}/ustore_deps_x86_linux.tar.gz",
+
     "echo \"-DCMAKE_BUILD_TYPE=Release -DPYARROW_DIR=${PYST}/pyarrow/\" > ${CMAKE_ARGS_F}",
     "mkdir -p build/ustore",
 ]

setup.py

@@ -52,8 +52,8 @@ def build_extension(self, ext):
             '-DUSTORE_BUILD_API_FLIGHT_CLIENT=1',
             '-DUSTORE_BUILD_SDK_PYTHON=1',
             '-DUSTORE_BUILD_TESTS=0',
-            '-DUSE_PYARROW_LIBS=1',
-            '-DUSE_CONAN=0'
+            '-DUSTORE_USE_PYARROW=1',
+            '-DUSE_CONAN=1'
         ]
 
         # Adding CMake arguments set as environment variable