Merge remote-tracking branch 'origin/dev' into f-overview

.docker/Dockerfile

@@ -2,11 +2,15 @@ ARG DOCKER_BASE_IMAGE
 FROM $DOCKER_BASE_IMAGE
 
 # build and install caosdb-cpplib
+COPY . /caosdb-octavelib
+WORKDIR /caosdb-octavelib
+RUN pip3 install -U -r dev-requirements.txt
 WORKDIR /libcaosdb/
 RUN mkdir build
 WORKDIR /libcaosdb/build
 RUN conan create .. --build=missing -s "compiler.libcxx=libstdc++11"
 
+RUN apt-get update
 RUN apt-get install -y octave-common liboctave8 octave
 RUN apt-get install -y liboctave-dev
 RUN apt-get install -y unzip
@@ -24,9 +28,7 @@ WORKDIR /MOxUnit-master/
 RUN make install
 COPY .docker/caosdb_client.json /caosdb_client.json
 
-COPY . /caosdb-octavelib
 WORKDIR /caosdb-octavelib
 RUN rm -rf .git
 
 RUN pip3 install -U -r doc/requirements.txt
-RUN pip3 install -U -r dev-requirements.txt

.gitlab/merge_request_templates/Default.md

@@ -26,7 +26,9 @@ guidelines](https://gitlab.com/caosdb/caosdb/-/blob/dev/REVIEW_GUIDELINES.md)
 - [ ] All automated tests pass
 - [ ] Reference related issues
 - [ ] Up-to-date CHANGELOG.md (or not necessary)
+- [ ] Up-to-date JSON schema (or not necessary)
 - [ ] Appropriate user and developer documentation (or not necessary)
+  - Update / write published documentation (`make doc`).
   - How do I use the software?  Assume "stupid" users.
   - How do I develop or debug the software?  Assume novice developers.
 - [ ] Annotations in code (Gitlab comments)
@@ -40,7 +42,8 @@ guidelines](https://gitlab.com/caosdb/caosdb/-/blob/dev/REVIEW_GUIDELINES.md)
 - [ ] I understand the intent of this MR
 - [ ] All automated tests pass
 - [ ] Up-to-date CHANGELOG.md (or not necessary)
-- [ ] Appropriate user and developer documentation (or not necessary)
+- [ ] Appropriate user and developer documentation (or not necessary), also in published
+      documentation.
 - [ ] The test environment setup works and the intended behavior is reproducible in the test
   environment
 - [ ] In-code documentation and comments are up-to-date.

CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased] ##
+
+### Added ###
+
+### Changed ###
+
+### Deprecated ###
+
+### Removed ###
+
+### Fixed ###
+
+### Security ###
+
 ## [0.2.1] - 2023-02-17 ##
 
 ### Changed ###

DESCRIPTION

 # See https://octave.org/doc/interpreter/The-DESCRIPTION-File.html
 Name: caosdb
-Version: 0.2.1
+Version: 0.2.2-dev
 Date: 2023-02-17
 Author: Daniel Hornung <d.hornung@indiscale.com>
 Maintainer: Daniel Hornung <d.hornung@indiscale.com>

README_SETUP.md

@@ -4,7 +4,7 @@
 
 This package requires the following software:
 
-- conan: `pip install conan`
+- conan: `pip install "conan<2"`
 - libcaosdb: Download the [libcaosdb sources](https://gitlab.com/caosdb/caosdb-cpplib) and run `make conan`.  See
   https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib for further instructions.
 - For running this library, a valid libcaosdb configuration is needed, for example a

RELEASE_GUIDELINES.md

@@ -66,10 +66,18 @@ See [full changelog](https://gitlab.indiscale.com/caosdb/src/caosdb-octavelib/-/
 These steps are necessary for creating the upstream package at Octave's repository:
 
 1. Update Octave-package repository on github.com:
-    1. In `packages/caosdb.yaml`, create new version release:
-       1. Set `id`: same as tag
-       2. Set `date`: today
-       3. Set `url`: Use the asset from the Gitlab release, for example [this url](https://gitlab.indiscale.com/caosdb/src/caosdb-octavelib/-/archive/v0.0.1/caosdb-octavelib-v0.0.1.tar.gz).
-       4. Set `sha256`: Download the asset and run `sha256` on it:  
-          `curl https://gitlab.indiscale.com/[...].tar.bz2 | sha256sum`
-    2. Create pull request at https://github.com/gnu-octave/packages .
+   1. In `packages/caosdb.yaml`, create new version release:
+      1. Set `id`: same as tag
+      2. Set `date`: today
+      3. Set `url`: Use the asset from the Gitlab release, for example [this url](https://gitlab.indiscale.com/caosdb/src/caosdb-octavelib/-/archive/v0.0.1/caosdb-octavelib-v0.0.1.tar.gz).
+      4. Set `sha256`: Download the asset and run `sha256` on it:  
+         `curl https://gitlab.indiscale.com/[...].tar.bz2 | sha256sum`
+   2. Commit with commit message "Package release CaosDB-octavelib 0.2.1"
+   3. Create pull request at https://github.com/gnu-octave/packages and accept it:
+      - Assign to myself.
+      - Set label `package release`.
+      - Ignore failing test `check-package` if the error is:  
+        ```
+        [EE] The build tool `conan' seems to be missing.
+        ```
+      - Merge pull request. 

dev-requirements.txt

@@ -4,7 +4,7 @@ certifi==2021.10.8
 chardet==4.0.0
 charset-normalizer==2.0.7
 colorama==0.4.4
-conan==1.54.0
+conan==1.61.0
 deprecation==2.1.0
 distro==1.6.0
 fasteners==0.16.3

doc/conf.py

@@ -30,7 +30,7 @@ author = 'Daniel Hornung'
 version = '0.2'
 # The full version, including alpha/beta/rc tags
 # Example: release = '0.5.2-rc2'
-release = '0.2.1'
+release = '0.2.2-dev'
 
 
 # -- General configuration ---------------------------------------------------