From a737a9bbb8790ed7a6626b6b91f44a995688b1ad Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 18 Aug 2022 13:16:37 +0200
Subject: [PATCH] PIPELINE
---
conanfile.py | 3 ++-
requirements.txt | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/conanfile.py b/conanfile.py
index a5e6a3b..906ba04 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -25,7 +25,7 @@ class CaosdbConan(ConanFile):
("grpc/1.48.0"),
]
build_requires = [
- ("boost/1.77.0"),
+ ("boost/1.78.0"),
("gtest/1.11.0"),
]
exports = ("*.cmake", "*CMakeLists.txt", "*.in",
@@ -38,6 +38,7 @@ class CaosdbConan(ConanFile):
if self.settings.os == "Windows":
del self.options.fPIC
self.options["boost"].without_python = True
+ self.options["boost"].filesystem_version = "3"
# def source(self):
# self.run("git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git")
diff --git a/requirements.txt b/requirements.txt
index 3b1421b..d8e16e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ bottle==0.12.21
certifi==2022.6.15
charset-normalizer==2.1.0
colorama==0.4.5
-conan==1.51.2
+conan==1.51.3
distro==1.6.0
fasteners==0.17.3
future==0.18.2
--
GitLab