Merge pull request #53 from dioptra-io/fix-caracal-build

fix building issue with conan >2.0

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.14.1
+current_version = 0.14.3
 commit = True
 tag = True
 message = release(project): {current_version} → {new_version}

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v18
+      - uses: cachix/install-nix-action@v20
       - uses: cachix/cachix-action@v12
         with:
           name: ${{ secrets.CACHIX_NAME }}
@@ -36,7 +36,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt install --yes build-essential cmake gcovr ninja-build python3-pip
-          pip3 install conan
+          pip3 install "conan<2.0"
       - name: Configure project
         run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-fprofile-arcs -ftest-coverage -fsanitize=address -fsanitize=undefined" -DWITH_CONAN=ON -DWITH_TESTS=ON
       - name: Build tests
@@ -56,7 +56,9 @@ jobs:
           path: ~/.conan/data
           key: ${{ runner.os }}-x86_64
       - name: Install dependencies
-        run: brew install cmake conan gcovr ninja
+        run: brew install cmake gcovr ninja
+      - name: Install Conan
+        run: pip3 install "conan<2.0"
       - name: Configure project (try 1/2)
         run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-fprofile-arcs -ftest-coverage -fsanitize=address -fsanitize=undefined" -DWITH_CONAN=ON -DWITH_TESTS=ON
         continue-on-error: true

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(caracal VERSION 0.14.1)
+project(caracal VERSION 0.14.3)
 
 # We have Find* modules in two places:
 # - The build directory, for the libraries fetched by Conan

Dockerfile

@@ -4,14 +4,14 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     apt-get install --no-install-recommends --quiet --yes \
-        build-essential \
-        cmake \
-        ninja-build \
-        python3-pip && \
+    build-essential \
+    cmake \
+    ninja-build \
+    python3-pip && \
     rm --force --recursive /var/lib/apt/lists/*
 
 # hadolint ignore=DL3059
-RUN python3 -m pip install --no-cache-dir build conan>=1.35
+RUN python3 -m pip install --no-cache-dir build "conan>=1.35,<2.0"
 
 WORKDIR /tmp
 COPY . .

flake.nix

@@ -13,7 +13,7 @@
         packages = {
           caracal = pkgs.stdenv.mkDerivation {
             pname = "caracal";
-            version = "0.14.1";
+            version = "0.14.3";
             src = self;
             nativeBuildInputs = [
               pkgs.cmake

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "cmake", "conan", "ninja", "scikit-build", "pybind11"]
+requires = ["setuptools", "wheel", "cmake", "conan<2.0", "ninja", "scikit-build", "pybind11"]
 build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="pycaracal",
-    version="0.14.1",
+    version="0.14.3",
     author="Maxime Mouchet",
     author_email="max@maxmouchet.com",
     url="https://github.com/dioptra-io/caracal",