Merge branch 'release-v0.1.2' into 'main'

REL: Release v0.1.2

See merge request !37

CMakeLists.txt

@@ -20,10 +20,10 @@
 
 cmake_minimum_required(VERSION 3.13)
 
-set(libcaosdb_VERSION 0.1.1)
+set(libcaosdb_VERSION 0.1.2)
 set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0)
 set(libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 7)
-set(libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 2)
+set(libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 3)
 set(libcaosdb_COMPATIBLE_SERVER_VERSION_PRE_RELEASE "")
 
 project(libcaosdb

RELEASE_GUIDELINES.md

@@ -13,20 +13,32 @@ guidelines of the CaosDB Project
 
 ## Steps
 
-1. Create a release branch from the dev branch. This prevents further changes
-   to the code base and a never ending release process. Naming: `release-<VERSION>`
+1. Create a release branch from the dev branch. This prevents further changes to
+   the code base and a never ending release process. Naming:
+   `release-<VERSION>`. Also create a branch with the same name in cppinttests.
 
 2. Update CHANGELOG.md
 
 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 version variables and
+      make sure that the compatible caosdb-server version is set correctly.
+   2. In `conanfile.py`: Update the `version` variable.
+   3. In `caosdb-cppinttest/conanfile.py`: Update the version
 
 5. Merge the release branch into the main branch.
 
-6. Tag the latest commit of the main branch with `v<VERSION>`.
+6. Tag the latest commit of the main branch with `v<VERSION>`. Push the tag and the main branch.
 
-7. Delete the release branch.
+7. Create release in Gitlab:
+   1. On [Releases](https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib/-/releases), click "New release"
+   2. Choose tag, type release title (same as tag), no milestone, possibly short release note, no
+      manual assets are necessary, possibly link to documentation.
 
-8. TODO...
+8. Delete the release branch.
+
+9. Release cppinttests with updated cpplib version
+
+10. Merge `main` back into `dev` and increase patch version by one to begin next
+    release cycle. Do the same in cppintest.

conanfile.py

@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
 
 class CaosdbConan(ConanFile):
     name = "caosdb"
-    version = "0.1.1"
+    version = "0.1.2"
     license = "AGPL-3.0-or-later"
     author = "Timm C. Fitschen <t.fitschen@indiscale.com>"
     url = "https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git"
@@ -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"),

doc/CHANGELOG.md

@@ -5,6 +5,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+- #41 Updated Conan version in CI pipeline.
+
+### Security
+
+### Documentation
+
+## [0.1.2] - 2022-05-31
+(Florian Spreckelsen)
+
+### Fixed
+
+- #41 Updated Conan version in CI pipeline.
+
 ## [0.1.1 - 2022-04-12]
 
 ### Security

doc/requirements.txt

@@ -16,13 +16,13 @@ pytz==2021.1
 requests==2.25.1
 six==1.16.0
 snowballstemmer==2.1.0
-Sphinx==4.0.1
-sphinx-rtd-theme==0.5.2
+Sphinx==4.5.0
+sphinx-rtd-theme==1.0.0
 sphinx-sitemap==2.2.0
 sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-htmlhelp==2.0.0
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.4
+sphinxcontrib-serializinghtml==1.1.5
 urllib3==1.26.7

requirements.txt

@@ -4,13 +4,13 @@ certifi==2021.10.8
 chardet==4.0.0
 charset-normalizer==2.0.7
 colorama==0.4.4
-conan==1.43.0
+conan==1.48.0
 deprecation==2.1.0
 distro==1.6.0
 fasteners==0.16.3
 future==0.18.2
 idna==3.2
-Jinja2==2.11.3
+Jinja2==3.1.1
 jsonschema==4.1.0
 MarkupSafe==2.0.1
 node-semver==0.6.1