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

Version bump: 0.2.2-dev

parents 6939f304 dbf34784
No related branches found
No related tags found
No related merge requests found
Pipeline #33753 passed
Pipeline: caosdb-octaveinttest

#33760

    ...@@ -28,5 +28,5 @@ COPY . /caosdb-octavelib ...@@ -28,5 +28,5 @@ COPY . /caosdb-octavelib
    WORKDIR /caosdb-octavelib WORKDIR /caosdb-octavelib
    RUN rm -rf .git RUN rm -rf .git
    RUN pip3 install -r doc/requirements.txt RUN pip3 install -U -r doc/requirements.txt
    RUN pip3 install -r dev-requirements.txt RUN pip3 install -U -r dev-requirements.txt
    ...@@ -47,6 +47,12 @@ build-testenv: ...@@ -47,6 +47,12 @@ build-testenv:
    image: docker:20.10 image: docker:20.10
    script: script:
    - DOCKER_BASE_IMAGE="${CPPLIB_REGISTRY_IMAGE}" - 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 - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
    - if docker pull "$DOCKER_BASE_IMAGE" ; then - if docker pull "$DOCKER_BASE_IMAGE" ; then
    echo "DOCKER_BASE_IMAGE=${DOCKER_BASE_IMAGE}" ; echo "DOCKER_BASE_IMAGE=${DOCKER_BASE_IMAGE}" ;
    ......
    ...@@ -19,6 +19,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -19,6 +19,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    ### Security ### ### Security ###
    ## [0.2.1] - 2023-02-17 ##
    ### Changed ###
    - Updated necessary Conan version to 1.54.
    ## [0.2.0] - 2022-09-26 ## ## [0.2.0] - 2022-09-26 ##
    ......
    # 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.2.1-dev Version: 0.2.2-dev
    Date: 2022-09-26 Date: 2023-02-17
    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
    ......
    % Copyright (C) 2021 IndiScale GmbH <info@indiscale.com> % Copyright (C) 2021-2023 IndiScale GmbH <info@indiscale.com>
    % Copyright (C) 2021 Daniel Hornung <d.hornung@indiscale.com> % Copyright (C) 2021-2023 Daniel Hornung <d.hornung@indiscale.com>
    % %
    % This file is a part of the CaosDB Project. % This file is a part of the CaosDB Project.
    % %
    ...@@ -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-09-26"/>\n', ... ' <meta name="date" content="2023-02-17"/>\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 ', ...
    ......
    ...@@ -23,14 +23,14 @@ import sphinx_rtd_theme # type: ignore # noqa: 401 ...@@ -23,14 +23,14 @@ import sphinx_rtd_theme # type: ignore # noqa: 401
    # -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------
    project = 'OctaveCaosDB' project = 'OctaveCaosDB'
    copyright = '2022, IndiScale GmbH' copyright = '2021-2023, IndiScale GmbH'
    author = 'Daniel Hornung' author = 'Daniel Hornung'
    # The short X.Y version # The short X.Y version
    version = '0.2' 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.2.1-dev' release = '0.2.2-dev'
    # -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment