Merge remote-tracking branch 'origin/dev' into f-related-projects

.gitlab/merge_request_templates/Default.md

@@ -28,6 +28,7 @@ guidelines](https://gitlab.com/caosdb/caosdb/-/blob/dev/REVIEW_GUIDELINES.md)
 - [ ] 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)
@@ -41,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.

CMakeLists.txt

@@ -20,7 +20,7 @@
 
 cmake_minimum_required(VERSION 3.13)
 
-set(libcaosdb_VERSION 0.2.2)
+set(libcaosdb_VERSION 0.3.0)
 set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0)
 set(libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 9)
 set(libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 0)

Makefile

@@ -45,20 +45,21 @@ endif
 help:
 	@echo "Targets:"
 	@echo "    style - auto-format the source files."
-	@echo "    conan-install - Install locally with Conan."
-	@echo -e "    conan-create - Create conan binary package in the local conan\n"\
+	@echo "    conan-install-deps - Install dependencies locally with Conan."
+	@echo -e "    conan-create - Create Conan binary package in the local conan\n"\
 	"                   repostory."
+	@echo "    conan - Install dependencies, then build and install package."
 
 style:
 	$(CLANG_FORMAT) -i --verbose \
 	 $$(find test/ src/ include/ -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.h.in")
 .PHONY: style
 
-conan-install:
+conan-install-deps:
 	conan install . -s $(CONAN_SETTINGS) || \
 	  (echo "'conan install' failed, trying to build from sources..."; \
 	   conan install . -s $(CONAN_SETTINGS) --build=missing)
-.PHONY: conan-install
+.PHONY: conan-install-deps
 
 conan-install-debug:
 	conan install . -s $(CONAN_SETTINGS) -s build_type=Debug || \
@@ -75,7 +76,7 @@ conan-create-debug:
 
 .PHONY: conan-create-debug
 
-conan: conan-install conan-create
+conan: conan-install-deps conan-create
 .PHONY: conan
 
 doc:

README.md

@@ -7,7 +7,7 @@ for LinkAhead and a part of the LinkAhead project.
 
 ## Setup
 
-Please read the installation notes [online](https://docs.indiscale.com/caosdb-cpplib/Install_develop.html) or [in the source repository](doc/Install_develop.md) for instructions
+Please read the installation notes [online](https://docs.indiscale.com/caosdb-cpplib/Install_develop.html) or [in the source repository](doc/Install_develop.rst) for instructions
 on how to build, use and develop this code.
 
 ## Further Reading

conanfile.py

@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
 
 class CaosdbConan(ConanFile):
     name = "caosdb"
-    version = "0.2.2"
+    version = "0.3.0-dev"
     license = "AGPL-3.0-or-later"
     author = "Timm C. Fitschen <t.fitschen@indiscale.com>"
     url = "https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git"

doc/CHANGELOG.md

@@ -5,6 +5,26 @@ 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] - YYYY-MM-DD ##
+(*Maintainer*)
+
+### Added
+
+### Changed
+
+- Updated dependency versions.
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+### Documentation
+
+
 ## [0.2.2] - 2023-06-15 ##
 (Timm Fitschen)
 

doc/Install_develop.rst

@@ -4,7 +4,7 @@ How to use and develop libcaosdb
 Dependencies
 ------------
 
--  See the `dependencies <DEPENDENCIES.md>`__ file, install with ``pip install -r requiremens.txt``.
+- See the `dependencies <DEPENDENCIES.md>`__ file, install with ``pip install -r requiremens.txt``.
 
 Build
 -----

requirements.txt

@@ -2,7 +2,7 @@ bottle==0.12.23
 certifi==2022.9.24
 charset-normalizer==2.1.1
 colorama==0.4.6
-conan==1.54.0
+conan==1.61.0
 distro==1.7.0
 fasteners==0.18
 future==0.18.2