diff --git a/src/caosadvancedtools/models/data_model.py b/src/caosadvancedtools/models/data_model.py index ce4b770256092e3dbbea95fbfbd064c1a4749d2e..ea864bde9fa3859c4853aa1daf40df56505cd769 100644 --- a/src/caosadvancedtools/models/data_model.py +++ b/src/caosadvancedtools/models/data_model.py @@ -251,7 +251,9 @@ class DataModel(dict): for par in entity.get_parents(): if par.name.lower() == valid_e.name.lower(): - par._wrap(valid_e) + # ToDo: Fix https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools/-/issues/140 + # and remove pylint disable, or close and leave + par._wrap(valid_e) # pylint: disable=protected-access def collect_entities(self): """ Collects all entities: explicitly defined RecordTypes and diff --git a/src/caosadvancedtools/models/parser.py b/src/caosadvancedtools/models/parser.py index 52552bd389bf5abfcb4d96d25456b12593ee16c8..8a18f15c9836feaaff64f6a252b0836d08dc3ca2 100644 --- a/src/caosadvancedtools/models/parser.py +++ b/src/caosadvancedtools/models/parser.py @@ -748,7 +748,9 @@ class JsonSchemaParser(Parser): return self._create_model_from_dict(model_dict, top_level_recordtype=top_level_recordtype) - def _create_model_from_dict(self, model_dict: [dict, List[dict]], top_level_recordtype: bool = True): + # ToDo: Fix https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools/-/issues/139 + # and remove pylint disable + def _create_model_from_dict(self, model_dict: [dict, List[dict]], top_level_recordtype: bool = True): # pylint: disable=arguments-renamed """Parse a dictionary and return the Datamodel created from it. The dictionary was typically created from the model definition in a json schema file. diff --git a/src/caosadvancedtools/table_json_conversion/convert.py b/src/caosadvancedtools/table_json_conversion/convert.py index b416fc29764fae73176f8c0177523a37dd353618..e4a8fe5ca10d1535dada2551ff3a426f74b8a954 100644 --- a/src/caosadvancedtools/table_json_conversion/convert.py +++ b/src/caosadvancedtools/table_json_conversion/convert.py @@ -628,8 +628,10 @@ def _set_in_nested(mydict: dict, path: list, value: Any, prefix: list = [], skip return mydict +# ToDo: Fix https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools/-/issues/138 +# and remove pylint disable def to_dict(xlsx: Union[str, BinaryIO], schema: Union[dict, str, TextIO], - validate: bool = None, strict: bool = False) -> dict: + validate: bool = None, strict: bool = False) -> dict: # pylint: disable=unused-argument """Convert the xlsx contents to a dict, it must follow a schema. Parameters