Merge branch 'dev' into f-upgrade-conan

RELEASE_GUIDELINES.md

@@ -20,8 +20,9 @@ guidelines of the CaosDB Project
 
 3. Check all general prerequisites.
 
-4. Prepare [CMakeLists.txt](./CMakeLists.txt): Check the `MAJOR`, `MINOR`, `PATCH`
-   version variables.
+4. Update version numbers:
+   1. In [CMakeLists.txt](./CMakeLists.txt): Check the `MAJOR`, `MINOR`, `PATCH` version variables.
+   2. In `conanfile.py`: Update the `version` variable.
 
 5. Merge the release branch into the main branch.
 

conanfile.py

@@ -16,7 +16,6 @@ class CaosdbConan(ConanFile):
     requires = [
         ("boost/1.77.0"),
         ("grpc/1.39.1"),
-        ("zlib/1.2.12"),        # TODO Remove when grpc dows not require 1.2.10
     ]
     build_requires = [
         ("gtest/1.11.0"),