Some fixes (#550)

* Some fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: Hind-M

.github/workflows/conan.yaml

@@ -11,13 +11,13 @@ jobs:
 
     steps:
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].6
+        uses: mozilla-actions/[email protected].9
 
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Setup Conan Environment
-        uses: hankhsu1996/setup-conan@v1.0.0
+        uses: hankhsu1996/setup-conan@v1.1.0
         with:
           cache-dependencies: false
           cache-tool: false

conanfile.py

@@ -1,7 +1,7 @@
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.build.cppstd import check_min_cppstd
-from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import copy
 from conan.tools.microsoft import is_msvc
 from conan.tools.scm import Version
@@ -14,12 +14,11 @@ class SparrowRecipe(ConanFile):
     description = "C++20 idiomatic APIs for the Apache Arrow Columnar Format"
     license = "Apache-2.0"
     author = "Man Group"
-    url = "https://github.com/conan-io/conan-center-index"
-    homepage = "https://github.com/man-group/sparrow"
+    url = "https://github.com/man-group/sparrow"
+    homepage = "https://man-group.github.io/sparrow"
     topics = ("arrow", "apache arrow", "columnar format", "dataframe")
     package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
-    generators = "CMakeDeps"
     exports_sources = "include/*", "LICENSE", "src/*", "cmake/*", "docs/*", "CMakeLists.txt", "sparrowConfig.cmake.in"
     options = {
         "shared": [True, False],
@@ -49,6 +48,7 @@ def requirements(self):
             self.test_requires("benchmark/1.9.4")
 
     def build_requirements(self):
+        self.tool_requires("cmake/[>=3.28.1 <4.2.0]")
         if self.options.get_safe("generate_documentation"):
             self.tool_requires("doxygen/1.9.4", options={"enable_app": "True"})
 
@@ -88,6 +88,9 @@ def layout(self):
         cmake_layout(self, src_folder=".")
 
     def generate(self):
+        deps = CMakeDeps(self)
+        deps.generate()
+
         tc = CMakeToolchain(self)
         tc.variables["USE_DATE_POLYFILL"] = self.options.get_safe(
             "use_date_polyfill", False)

include/sparrow/config/sparrow_version.hpp

@@ -23,4 +23,9 @@ namespace sparrow
     constexpr int SPARROW_BINARY_CURRENT = 10;
     constexpr int SPARROW_BINARY_REVISION = 0;
     constexpr int SPARROW_BINARY_AGE = 1;
+
+    static_assert(
+        SPARROW_BINARY_AGE <= SPARROW_BINARY_CURRENT,
+        "SPARROW_BINARY_AGE cannot be greater than SPARROW_BINARY_CURRENT"
+    );
 }

test/main.cpp

@@ -19,14 +19,19 @@
 
 #include "better_junit_reporter.hpp"
 
-TEST_CASE("version is readable")
+TEST_CASE("versions are readable")
 {
     // TODO: once available on OSX, use `<format>` facility instead.
-    // We only try to make sure the version valeus are printable, whatever their type.
+    // We only try to make sure the version values are printable, whatever their type.
     // AKA this is not written to be fancy but to force conversion to string.
     using namespace sparrow;
     [[maybe_unused]] const std::string printable_version = std::string("sparrow version : ")
                                                            + std::to_string(SPARROW_VERSION_MAJOR) + "."
                                                            + std::to_string(SPARROW_VERSION_MINOR) + "."
                                                            + std::to_string(SPARROW_VERSION_PATCH);
+
+    [[maybe_unused]] const std::string printable_binary_version = std::string("sparrow binary version: ")
+                                                                  + std::to_string(SPARROW_BINARY_CURRENT) + "."
+                                                                  + std::to_string(SPARROW_BINARY_REVISION)
+                                                                  + "." + std::to_string(SPARROW_BINARY_AGE);
 }