diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 74e919fb6f078ac3ade2756e716ad38b948cf2e2..cc95db8ea1827a22bc5d96dcbce6f434345ad4c6 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -28,5 +28,5 @@ COPY . /caosdb-octavelib
WORKDIR /caosdb-octavelib
RUN rm -rf .git
-RUN pip3 install -r doc/requirements.txt
-RUN pip3 install -r dev-requirements.txt
+RUN pip3 install -U -r doc/requirements.txt
+RUN pip3 install -U -r dev-requirements.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f9c978ffe351db0dd2eafa5c88f196674c52e63..dc3bf9a1f9327a4247d81f15b0b2c7c62d3e0e4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,12 @@ build-testenv:
image: docker:20.10
script:
- DOCKER_BASE_IMAGE="${CPPLIB_REGISTRY_IMAGE}"
+ - if [[ "${CI_COMMIT_REF_NAME}" == release* ]] ; then
+ echo "Release detected, choosing cpplib image from 'main' branch." ;
+ DOCKER_BASE_IMAGE="$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:main" ;
+ else
+ echo "CI_COMMIT_REF_NAME $CI_COMMIT_REF_NAME" ;
+ fi
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- if docker pull "$DOCKER_BASE_IMAGE" ; then
echo "DOCKER_BASE_IMAGE=${DOCKER_BASE_IMAGE}" ;
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81179a95640ee14566518f2046904b07f42770cd..135141e3fd2a160988bb54244da9bdd5de7ff15e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security ###
+## [0.2.1] - 2023-02-17 ##
+
+### Changed ###
+
+- Updated necessary Conan version to 1.54.
## [0.2.0] - 2022-09-26 ##
diff --git a/DESCRIPTION b/DESCRIPTION
index ad2df23f1e2db781146d1b254da9bf22ce2445a7..3d428e2ed4bd38e5f774d9a1e94ce0ee340865da 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
# See https://octave.org/doc/interpreter/The-DESCRIPTION-File.html
Name: caosdb
-Version: 0.2.1-dev
-Date: 2022-09-26
+Version: 0.2.2-dev
+Date: 2023-02-17
Author: Daniel Hornung <d.hornung@indiscale.com>
Maintainer: Daniel Hornung <d.hornung@indiscale.com>
Title: Octave and Matlab library for CaosDB
diff --git a/doc/Generate_Octave_Doc.m b/doc/Generate_Octave_Doc.m
index ff72c4e61c99da45f91d1a57bbff53e869bfed90..97c817fc02f1d3c9741a5044f83fd1eaaea76cf1 100644
--- a/doc/Generate_Octave_Doc.m
+++ b/doc/Generate_Octave_Doc.m
@@ -1,5 +1,5 @@
-% Copyright (C) 2021 IndiScale GmbH <info@indiscale.com>
-% Copyright (C) 2021 Daniel Hornung <d.hornung@indiscale.com>
+% Copyright (C) 2021-2023 IndiScale GmbH <info@indiscale.com>
+% Copyright (C) 2021-2023 Daniel Hornung <d.hornung@indiscale.com>
%
% This file is a part of the CaosDB Project.
%
@@ -23,7 +23,7 @@ header = @(a_1, a_2, a_3) ...
'<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">\n', ...
' <head>\n', ...
' <meta http-equiv="content-type" content="text/html; charset=utf-8" />\n', ...
- ' <meta name="date" content="2022-09-26"/>\n', ...
+ ' <meta name="date" content="2023-02-17"/>\n', ...
' <meta name="generator" content="generate_html 0.4.0" />\n', ...
' <meta name="author" content="The Octave-Forge Community" />\n', ...
' <meta name="description" content="Octave-Forge is a collection of packages ', ...
diff --git a/doc/conf.py b/doc/conf.py
index c497c8f3cba3d592acfcf141fa4c8cc8a93ec4fb..b191c5bc9e952742d38524b5084be4fded799441 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -23,14 +23,14 @@ import sphinx_rtd_theme # type: ignore # noqa: 401
# -- Project information -----------------------------------------------------
project = 'OctaveCaosDB'
-copyright = '2022, IndiScale GmbH'
+copyright = '2021-2023, IndiScale GmbH'
author = 'Daniel Hornung'
# The short X.Y version
version = '0.2'
# The full version, including alpha/beta/rc tags
# Example: release = '0.5.2-rc2'
-release = '0.2.1-dev'
+release = '0.2.2-dev'
# -- General configuration ---------------------------------------------------