diff --git a/CHANGELOG.md b/CHANGELOG.md index c58ffd35bbc207f94abdcc5937ab43d9fe758700..81179a95640ee14566518f2046904b07f42770cd 100644 --- 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 ### diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 1e3dc450cd709ca875a6f265040ede67bb36f4a0..4c5a73941334e3a858c287abe2789c2d60f4a55b 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -1,6 +1,6 @@ # Dependencies for caosdb-octavelib # -* caosdb-cpplib +* caosdb-cpplib >= 0.2 * octave >= 4.4 * liboctave-dev (tested with 6.2.0) diff --git a/DESCRIPTION b/DESCRIPTION index f96cda86cff6fc82d2e2c961f4f24e3d56b10266..ad2df23f1e2db781146d1b254da9bf22ce2445a7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ # 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 diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 30610b6858d494c9b669a6394e740417e493a7d2..7f162d59600e5b1ae12176c0bfc45b579b5cd922 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -1,4 +1,4 @@ -# 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 diff --git a/conanfile.txt b/conanfile.txt index 696007ed2670db98042a68f9df2c173b114c0d1a..1e2e5bd368c1d00f13b07d5986790f8001b53e71 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -caosdb/[>=0.2.0-dev, include_prerelease=True] +caosdb/[>=0.2.1, include_prerelease=True] [build_requires] boost/1.78.0 diff --git a/doc/Generate_Octave_Doc.m b/doc/Generate_Octave_Doc.m index dc5b871c233d2de604cc228f078a6f2f4af605a1..ff72c4e61c99da45f91d1a57bbff53e869bfed90 100644 --- 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 ', ... diff --git a/doc/conf.py b/doc/conf.py index 262c9e3c306aa43cb6be80b0386422cd9fac85c4..c497c8f3cba3d592acfcf141fa4c8cc8a93ec4fb 100644 --- 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 --------------------------------------------------- diff --git a/src/configure b/src/configure index d6c2f73db9ecb11dcf64739e4f63d284679ed361..3d661fc87cc73597cd4b794fbe540e94f841c1c5 100755 --- 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