From 6a8b5ccf9e3a53673ff989b7d5cebcf146f0a39d Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Sun, 31 Oct 2021 20:59:31 +0100 Subject: [PATCH] REL: fix some license headers and Changelog --- CHANGELOG.md | 11 ++++++----- unittests/test_schema.py | 25 ++++++++++++++++++++++--- unittests/test_yamlapi.py | 3 --- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27fd21b3..7b61b9c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### -- It is possible now to supply a password for caosdb_admin on the command line and also activate the user directly using "-c". +- It is possible now to supply a password for caosdb_admin on the command line + and also activate the user directly using "-c". * Added examples for complex data models to documentation * extended apiutils with `resolve_reference(Property)` * is_reference function for Properties +* function `retrieve_substructure` that recursively adds connected entities. ### Changed ### @@ -24,14 +26,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Entity.add_property and Entity.add_parent do not accept `**kwargs`-style keywords anymore. Formerly known keywords have been refactored into named parameters. -* [#35](https://gitlab.com/caosdb/caosdb-pylib/-/issues/35) Loggers now use the name of - the unit where they are called instead of a static name +* [#35](https://gitlab.com/caosdb/caosdb-pylib/-/issues/35) Loggers now use the + name of the unit where they are called instead of a static name ### Deprecated ### * `id_query(ids)` in apiutils (to be removed with >=0.5.4) * The whole yamlapi with the following functions (to be removed with >=0.5.4): - * `append_sublist` + * `append_sublist` * `kv_to_xml` * `dict_to_xml` * `yaml_to_xml` @@ -59,7 +61,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * `etag` property for the `caosdb.Query` class. The etag allows to debug the caching and to decide whether the server has changed between queries. * function `_read_config_files` to read `pycaosdb.ini` files from different paths. -* function `retrieve_substructure` that recursively adds connected entities. ### Changed ### diff --git a/unittests/test_schema.py b/unittests/test_schema.py index 387518c9..1552179a 100644 --- a/unittests/test_schema.py +++ b/unittests/test_schema.py @@ -1,7 +1,26 @@ -#!/bin/python -# Test configuration schema -# A. Schlemmer, 01/2021 +# -*- coding: utf-8 -*- +# +# This file is a part of the CaosDB Project. +# +# Copyright (C) 2021 Alexander Schlemmer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. +# +"""Test configuration schema. +A. Schlemmer, 01/2021 +""" from jsonschema.exceptions import ValidationError from pytest import raises from glob import glob diff --git a/unittests/test_yamlapi.py b/unittests/test_yamlapi.py index 4af8a53b..cdb1e049 100644 --- a/unittests/test_yamlapi.py +++ b/unittests/test_yamlapi.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # -# ** header v3.0 # This file is a part of the CaosDB Project. # # Copyright (C) 2021 IndiScale GmbH <info@indiscale.com> @@ -19,8 +18,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. # -# ** end header -# import os import warnings -- GitLab