From 3d15a984e20aa9b6fd4a5c85452027b317ebfd85 Mon Sep 17 00:00:00 2001 From: Thomas Sell Date: Wed, 26 Jul 2023 16:27:15 +0200 Subject: [PATCH] black formatting --- altamisa/isatab/parse_assay_study.py | 3 ++- altamisa/isatab/validate_assay_study.py | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/altamisa/isatab/parse_assay_study.py b/altamisa/isatab/parse_assay_study.py index 1fb473d..2e3cc02 100644 --- a/altamisa/isatab/parse_assay_study.py +++ b/altamisa/isatab/parse_assay_study.py @@ -322,7 +322,8 @@ def build(self, line: List[str]) -> models.Material: models.Comment(hdr.label, line[hdr.col_no]) for hdr in self.comment_headers ) factor_values = tuple( - self._build_complex(hdr, line, models.FactorValue, allow_list=True) for hdr in self.factor_value_headers + self._build_complex(hdr, line, models.FactorValue, allow_list=True) + for hdr in self.factor_value_headers ) material_type = self._build_freetext_or_term_ref(self.material_type_header, line) # Then, constructing ``Material`` is easy diff --git a/altamisa/isatab/validate_assay_study.py b/altamisa/isatab/validate_assay_study.py index e7e5925..0e4f02b 100644 --- a/altamisa/isatab/validate_assay_study.py +++ b/altamisa/isatab/validate_assay_study.py @@ -97,9 +97,7 @@ def has_content(value): [any(has_content(v) for v in char.value) for char in material.characteristics] ) any_comm = any([comm.value for comm in material.comments]) - any_fact = any( - [any(has_content(v) for v in fact.value) for fact in material.factor_values] - ) + any_fact = any([any(has_content(v) for v in fact.value) for fact in material.factor_values]) if not material.name and any( ( any_char,