Skip to content
Snippets Groups Projects
Verified Commit ff19aebf authored by Daniel Hornung's avatar Daniel Hornung
Browse files

REL: Initiate next release cycle. 

Also: Merge branch 'main' into dev
parents 23988644 00e56468
No related branches found
No related tags found
No related merge requests found
Pipeline #28714 passed
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-octaveinttest

#28718

    Show whitespace changes
    Inline Side-by-side
    CHANGELOG.md
    + 11
    − 0
    View file @ ff19aebf
    ...@@ -19,6 +19,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -19,6 +19,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    ### Security ### ### 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 ## ## [0.1.2] - 2022-02-21 ##
    ### Changed ### ### Changed ###
    ......
    DEPENDENCIES.md
    + 1
    − 1
    View file @ ff19aebf
    # Dependencies for caosdb-octavelib # # Dependencies for caosdb-octavelib #
    * caosdb-cpplib * caosdb-cpplib >= 0.2
    * octave >= 4.4 * octave >= 4.4
    * liboctave-dev (tested with 6.2.0) * liboctave-dev (tested with 6.2.0)
    ......
    DESCRIPTION
    + 2
    − 2
    View file @ ff19aebf
    # See https://octave.org/doc/interpreter/The-DESCRIPTION-File.html # See https://octave.org/doc/interpreter/The-DESCRIPTION-File.html
    Name: caosdb Name: caosdb
    Version: 0.1.3-dev Version: 0.2.1-dev
    Date: 2022-02-21 Date: 2022-09-26
    Author: Daniel Hornung <d.hornung@indiscale.com> Author: Daniel Hornung <d.hornung@indiscale.com>
    Maintainer: Daniel Hornung <d.hornung@indiscale.com> Maintainer: Daniel Hornung <d.hornung@indiscale.com>
    Title: Octave and Matlab library for CaosDB Title: Octave and Matlab library for CaosDB
    ......
    RELEASE_GUIDELINES.md
    + 1
    − 1
    View file @ ff19aebf
    # 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 This document specifies release guidelines in addition to the general release
    guidelines of the CaosDB Project guidelines of the CaosDB Project
    ......
    conanfile.txt
    + 1
    − 1
    View file @ ff19aebf
    [requires] [requires]
    caosdb/[>=0.2.0-dev, include_prerelease=True] caosdb/[>=0.2.1, include_prerelease=True]
    [build_requires] [build_requires]
    boost/1.78.0 boost/1.78.0
    ......
    doc/Generate_Octave_Doc.m
    + 1
    − 1
    View file @ ff19aebf
    ...@@ -23,7 +23,7 @@ header = @(a_1, a_2, a_3) ... ...@@ -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', ... '<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">\n', ...
    ' <head>\n', ... ' <head>\n', ...
    ' <meta http-equiv="content-type" content="text/html; charset=utf-8" />\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="generator" content="generate_html 0.4.0" />\n', ...
    ' <meta name="author" content="The Octave-Forge Community" />\n', ... ' <meta name="author" content="The Octave-Forge Community" />\n', ...
    ' <meta name="description" content="Octave-Forge is a collection of packages ', ... ' <meta name="description" content="Octave-Forge is a collection of packages ', ...
    ......
    doc/conf.py
    + 2
    − 2
    View file @ ff19aebf
    ...@@ -27,10 +27,10 @@ copyright = '2022, IndiScale GmbH' ...@@ -27,10 +27,10 @@ copyright = '2022, IndiScale GmbH'
    author = 'Daniel Hornung' author = 'Daniel Hornung'
    # The short X.Y version # The short X.Y version
    version = '0.1' version = '0.2'
    # The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
    # Example: release = '0.5.2-rc2' # Example: release = '0.5.2-rc2'
    release = '0.1.3-dev' release = '0.2.1-dev'
    # -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
    ......
    src/configure
    + 3
    − 1
    View file @ ff19aebf
    ...@@ -97,7 +97,9 @@ fi ...@@ -97,7 +97,9 @@ fi
    # conan install .. -s "compiler.libcxx=libstdc++11" # conan install .. -s "compiler.libcxx=libstdc++11"
    # cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE=Release -D AUTOFORMATTING=OFF .. # 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 .. cmake -G "Unix Makefiles" -D CMAKE_BUILD_TYPE="${BUILD_TYPE}" -D AUTOFORMATTING=OFF ..
    popd popd
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment