REL: Initiate next release cycle.

Also: Merge branch 'main' into dev

REL: Initiate next release cycle.
ff19aebf · Daniel Hornung · 23988644 · 00e56468 · ff19aebf · ff19aebf
Verified Commit ff19aebf authored 2 years ago by Daniel Hornung
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Security ###

+
+## [0.2.0] - 2022-09-26 ##
+
+### Added ###
+
+- Jupyter notebook with examples was added in `doc/notebooks/`.
+
+### Changed ###
+
+- Depends on libcaosdb >= 0.2, boost-1.78.  Some other dependencies were updated as well.
+
 ## [0.1.2] - 2022-02-21 ##

 ### Changed ###

--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
 # Dependencies for caosdb-octavelib #

-* caosdb-cpplib
+* caosdb-cpplib >= 0.2
 * octave >= 4.4
 * liboctave-dev (tested with 6.2.0)


--- a/DESCRIPTION
+++ b/DESCRIPTION
 # See https://octave.org/doc/interpreter/The-DESCRIPTION-File.html
 Name: caosdb
-Version: 0.1.3-dev
-Date: 2022-02-21
+Version: 0.2.1-dev
+Date: 2022-09-26
 Author: Daniel Hornung <d.hornung@indiscale.com>
 Maintainer: Daniel Hornung <d.hornung@indiscale.com>
 Title: Octave and Matlab library for CaosDB

--- a/RELEASE_GUIDELINES.md
+++ b/RELEASE_GUIDELINES.md
-# Release Guidelines for the CaosDB Python Client Library
+# Release Guidelines for the CaosDB Octave Client Library

 This document specifies release guidelines in addition to the general release
 guidelines of the CaosDB Project

--- a/conanfile.txt
+++ b/conanfile.txt
 [requires]
-caosdb/[>=0.2.0-dev, include_prerelease=True]
+caosdb/[>=0.2.1, include_prerelease=True]

 [build_requires]
 boost/1.78.0

--- a/doc/Generate_Octave_Doc.m
+++ b/doc/Generate_Octave_Doc.m
@@ -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-02-21"/>\n', ...
+           '  <meta name="date" content="2022-09-26"/>\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 ', ...

--- a/doc/conf.py
+++ b/doc/conf.py
@@ -27,10 +27,10 @@ copyright = '2022, IndiScale GmbH'
 author = 'Daniel Hornung'

 # The short X.Y version
-version = '0.1'
+version = '0.2'
 # The full version, including alpha/beta/rc tags
 # Example: release = '0.5.2-rc2'
-release = '0.1.3-dev'
+release = '0.2.1-dev'


 # -- General configuration ---------------------------------------------------

--- a/src/configure
+++ b/src/configure
@@ -97,7 +97,9 @@ fi

 # conan install .. -s "compiler.libcxx=libstdc++11"
 # cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Release -D AUTOFORMATTING=OFF ..
-conan install .. -s $CONAN_SETTINGS -s build_type="${BUILD_TYPE}"
+# Either have `--build=caosdb` here, or have the same options as libcaosdb,
+# e.g. `-o caosdb:build_acm=True`
+conan install .. -s $CONAN_SETTINGS -s build_type="${BUILD_TYPE}" --build=caosdb
 cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE="${BUILD_TYPE}" -D AUTOFORMATTING=OFF ..

 popd