diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 8a8867d62be898be3e171dec6b6ca2eb7e69b6e4..e8ca40c630d04f9dd0b0276d5f63beb06504a558 100644 --- a/RELEASE_GUIDELINES.md +++ b/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. diff --git a/conanfile.py b/conanfile.py index 409f65d7e34ec50d1c04f40f0f306911f0b4456d..f399a6445ef3a8f396ae08fc85fe3688fd80f5cc 100644 --- a/conanfile.py +++ b/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"),