Merge branch 'dev' into f-doc-ref-properties

CHANGELOG.md

@@ -25,6 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   documentation on adding REFERENCE properties, both in the docstring of
   `Entity.add_property` and in the data-insertion tutorial.
 
+## [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)
 

setup.py

@@ -48,7 +48,7 @@ from setuptools import find_packages, setup
 ISRELEASED = False
 MAJOR = 0
 MINOR = 11
-MICRO = 2
+MICRO = 3
 # 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

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:

src/doc/conf.py

@@ -29,10 +29,10 @@ copyright = '2022, IndiScale GmbH'
 author = 'Daniel Hornung'
 
 # The short X.Y version
-version = '0.11.2'
+version = '0.11.3'
 # The full version, including alpha/beta/rc tags
 # release = '0.5.2-rc2'
-release = '0.11.2-dev'
+release = '0.11.3-dev'
 
 
 # -- General configuration ---------------------------------------------------

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)

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()

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