diff --git a/CHANGELOG.md b/CHANGELOG.md index f3c6a023893526d8727858562a87453fdcaed60a..510b25282d64dd1da7c30ca86b09f3dfbae38276 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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). +## [0.11.2] - 2023-03-14 ## + +### Fixed ### +- root logger is no longer used to create warnings. Fixes undesired output in + stderr + ## [0.11.1] - 2023-03-07 ## (Florian Spreckelsen) diff --git a/setup.py b/setup.py index a281a7b67182c19b984846f498bdd99a3a2d6dc5..a6d3594c7f37820cd4f5e66cb9761651d0c47907 100755 --- a/setup.py +++ b/setup.py @@ -45,10 +45,10 @@ from setuptools import find_packages, setup # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ######################################################################## -ISRELEASED = True +ISRELEASED = False MAJOR = 0 MINOR = 11 -MICRO = 1 +MICRO = 2 # Do not tag as pre-release until this commit # https://github.com/pypa/packaging/pull/515 # has made it into a release. Probably we should wait for pypa/packaging>=21.4 diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py index f3195b8e152f0cb13e5dab3e3a449b7bb36623b4..9c68e9db6cbdef827b9319505b4b81bc8db1ebac 100644 --- a/src/caosdb/apiutils.py +++ b/src/caosdb/apiutils.py @@ -43,6 +43,8 @@ from caosdb.common.models import (Container, Entity, File, Property, Query, get_config, SPECIAL_ATTRIBUTES) from caosdb.exceptions import CaosDBException +logger = logging.getLogger(__name__) + class EntityMergeConflictError(CaosDBException): """An error that is raised in case of an unresolvable conflict when merging @@ -413,7 +415,7 @@ def merge_entities(entity_a: Entity, entity_b: Entity, merge_references_with_emp """ - logging.warning( + logger.warning( "This function is currently experimental and insufficiently tested. Use with care.") # Compare both entities: diff --git a/src/doc/conf.py b/src/doc/conf.py index 3168916a86d208417ce580d43ce8ae952dde930d..292aa7a2a427da7044c9d6acf7b000cd2fa82a32 100644 --- a/src/doc/conf.py +++ b/src/doc/conf.py @@ -29,10 +29,10 @@ copyright = '2022, IndiScale GmbH' author = 'Daniel Hornung' # The short X.Y version -version = '0.11.1' +version = '0.11.2' # The full version, including alpha/beta/rc tags # release = '0.5.2-rc2' -release = '0.11.1' +release = '0.11.2-dev' # -- General configuration --------------------------------------------------- diff --git a/src/doc/high_level_api.rst b/src/doc/high_level_api.rst index 603052b135ad2289caea7e3bed59ae9d3301f811..e92f2dd5e326b14222ad3c776ce5f5ed1ed31536 100644 --- a/src/doc/high_level_api.rst +++ b/src/doc/high_level_api.rst @@ -60,7 +60,7 @@ it using its high level representation: from caosdb.high_level_api import query - res = query("FIND Record Experiment") + res = query("FIND Experiment") experiment = res[0] # Use a property: print(experiment.date) @@ -80,7 +80,7 @@ series of commands to achieve the same result: import caosdb as db - res = db.execute_query("FIND Record Experiment") + res = db.execute_query("FIND Experiment") output = res.get_property("output") output_file = db.File(id=output.value[0].id).retrieve() print(output_file.path) diff --git a/src/doc/tutorials/complex_data_models.rst b/src/doc/tutorials/complex_data_models.rst index 0fa868e78bb45a2905dc99392a3a28a9832d369e..7b45b6a2681bcf781fd4acc9329ffada28d4e01c 100644 --- a/src/doc/tutorials/complex_data_models.rst +++ b/src/doc/tutorials/complex_data_models.rst @@ -69,8 +69,9 @@ Examples c.insert() # Useful for testing: wait until the user presses a key - # Meanwhile have a look at the WebUI: You can e.g. query "FIND Test*" to view - # all the entities created here and see the relations and links between them. + # Meanwhile have a look at the WebUI: You can e.g. query "FIND ENTITY Test*" + # to view all the entities created here and see the relations and links + # between them. b = input("Press any key to cleanup.") # cleanup everything after the user presses any button. c.delete() diff --git a/src/doc/tutorials/first_steps.rst b/src/doc/tutorials/first_steps.rst index 486cd4d437c8b13a253cadc8ed45f49b4a7634e4..7366d391cdf50b1d9f9107fc2d47f28d9df7bf7f 100644 --- a/src/doc/tutorials/first_steps.rst +++ b/src/doc/tutorials/first_steps.rst @@ -25,7 +25,7 @@ However, you can also translate the examples to the data model that you have at Let's start with a simple query. ->>> response = db.execute_query("FIND RECORD Guitar") +>>> response = db.execute_query("FIND Guitar") Queries work the same way as in the web interface. You simply provide the query string to the corresponding function (``db.execute_query``). However, the result is not