diff --git a/.docker/Dockerfile b/.docker/Dockerfile index cc95db8ea1827a22bc5d96dcbce6f434345ad4c6..9a62ddcdfb3d255d79c384f9c68e3cfd01a0fd7e 100644 --- a/.docker/Dockerfile +++ b/.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 diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md index 7859b7be21fb1c3eda91ee35173a8e3412a62066..3629e0ca3695000863d8c254516f64bf59a7bf60 100644 --- a/.gitlab/merge_request_templates/Default.md +++ b/.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. diff --git a/CHANGELOG.md b/CHANGELOG.md index 6656b72975953d09528561052c50a29be5721e98..135141e3fd2a160988bb54244da9bdd5de7ff15e 100644 --- a/CHANGELOG.md +++ b/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 ### diff --git a/DESCRIPTION b/DESCRIPTION index 74d244c4876ef01a15d88102f540db089038874e..3d428e2ed4bd38e5f774d9a1e94ce0ee340865da 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ # 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> diff --git a/README_SETUP.md b/README_SETUP.md index 3e483c6d7d8572b64882a726c30a0ef5e0fc94b0..935a693cfe8069b40be994eed7b0108276067e26 100644 --- a/README_SETUP.md +++ b/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 diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index c73c765d236106b48fc4288d6a00be0c9fb2d64c..110e928558d7c0f2cf458037573ed0b35e9faffb 100644 --- a/RELEASE_GUIDELINES.md +++ b/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. diff --git a/dev-requirements.txt b/dev-requirements.txt index 415bb8e6796d0cc532e30ab38f38c880d5116fb9..127265cd60afb998da041ea22cca9d4e45a2454f 100644 --- a/dev-requirements.txt +++ b/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 diff --git a/doc/conf.py b/doc/conf.py index 025f3d7e414210d7bbd1881fb396a03ffaaaf82a..b191c5bc9e952742d38524b5084be4fded799441 100644 --- a/doc/conf.py +++ b/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 ---------------------------------------------------