From 4b2b40bded2eb71ea9fd49b1125b0265c777215a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 20:40:10 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v3.4.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v3.4.0...v5.0.0) - [github.com/asottile/pyupgrade: v2.12.0 → v3.19.1](https://github.com/asottile/pyupgrade/compare/v2.12.0...v3.19.1) - [github.com/Lucas-C/pre-commit-hooks: v1.5.1 → v1.5.5](https://github.com/Lucas-C/pre-commit-hooks/compare/v1.5.1...v1.5.5) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3b569c9..bacabf6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: - id: reformat-pyproject - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.4.0 + rev: v5.0.0 hooks: - id: check-added-large-files - id: check-ast @@ -62,7 +62,7 @@ repos: - id: rst-inline-touching-normal - repo: https://github.com/asottile/pyupgrade - rev: v2.12.0 + rev: v3.19.1 hooks: - id: pyupgrade args: @@ -70,7 +70,7 @@ repos: - --keep-runtime-typing - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.5.1 + rev: v1.5.5 hooks: - id: remove-crlf - id: forbid-crlf From 472fbec02144078869170608c637ea85b493f986 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 20:40:25 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- mh_utils/worklist_parser/columns.py | 85 ++++++++++------------------- 1 file changed, 28 insertions(+), 57 deletions(-) diff --git a/mh_utils/worklist_parser/columns.py b/mh_utils/worklist_parser/columns.py index 84121cb..356695d 100644 --- a/mh_utils/worklist_parser/columns.py +++ b/mh_utils/worklist_parser/columns.py @@ -174,213 +174,184 @@ def from_attribute(cls, attribute: "Attribute") -> "Column": attribute_id=0, attribute_type=AttributeType.SystemDefined, dtype=str, - default_value='', - ), + default_value='', ), Column( name="Sample Name", attribute_id=1, attribute_type=AttributeType.SystemDefined, dtype=str, - default_value='', - ), + default_value='', ), Column( name="Rack Code", attribute_id=2, attribute_type=AttributeType.SystemDefined, dtype=str, - default_value='', - ), + default_value='', ), Column( name="Rack Position", attribute_id=3, attribute_type=AttributeType.SystemDefined, dtype=str, - default_value='', - ), + default_value='', ), Column( name="Plate Code", attribute_id=4, attribute_type=AttributeType.SystemDefined, dtype=str, - default_value='', - ), + default_value='', ), Column( name="Plate Position", attribute_id=5, attribute_type=AttributeType.SystemDefined, dtype=str, - default_value='', - ), + default_value='', ), Column( name="Sample Position", attribute_id=6, attribute_type=AttributeType.SystemDefined, dtype=str, - default_value='', - ), + default_value='', ), Column( name="Method", attribute_id=7, attribute_type=AttributeType.SystemDefined, dtype=as_path, - default_value=None, - ), + default_value=None, ), Column( name="Override DA Method", attribute_id=8, attribute_type=AttributeType.SystemDefined, dtype=as_path, - default_value=None, - ), + default_value=None, ), Column( name="Data File", attribute_id=9, attribute_type=AttributeType.SystemDefined, dtype=as_path, - default_value=None, - ), + default_value=None, ), Column( name="Sample Type", attribute_id=10, attribute_type=AttributeType.SystemDefined, dtype=str, - default_value="Unknown", - ), + default_value="Unknown", ), Column( name="Method Type", attribute_id=11, attribute_type=AttributeType.SystemDefined, dtype=str, default_value="Method No Override", - reorder_id=12, - ), + reorder_id=12, ), Column( name="Balance Override", attribute_id=12, attribute_type=AttributeType.SystemDefined, dtype=str, default_value="No Override", - reorder_id=13, - ), + reorder_id=13, ), Column( name="Inj Vol (µl)", attribute_id=13, attribute_type=AttributeType.SystemDefined, dtype=injection_volume, default_value=5, - reorder_id=14, - ), + reorder_id=14, ), Column( name="Equilib Time (min)", attribute_id=14, attribute_type=AttributeType.SystemDefined, dtype=int, default_value=0, - reorder_id=15, - ), + reorder_id=15, ), Column( name="Dilution", attribute_id=15, attribute_type=AttributeType.SystemDefined, dtype=int, default_value=1, - reorder_id=16, - ), + reorder_id=16, ), Column( name="Wt/Vol", attribute_id=16, attribute_type=AttributeType.SystemDefined, dtype=float, default_value=0, - reorder_id=17, - ), + reorder_id=17, ), Column( name="Comment", attribute_id=17, attribute_type=AttributeType.SystemDefined, dtype=str, default_value='', - reorder_id=18, - ), + reorder_id=18, ), Column( name="Barcode", attribute_id=18, attribute_type=AttributeType.SystemDefined, dtype=str, default_value='', - reorder_id=19, - ), + reorder_id=19, ), Column( name="Reserved1", attribute_id=19, attribute_type=AttributeType.SystemDefined, dtype=str, default_value='', - reorder_id=-1, - ), + reorder_id=-1, ), Column( name="Reserved2", attribute_id=20, attribute_type=AttributeType.SystemDefined, dtype=str, default_value='', - reorder_id=-1, - ), + reorder_id=-1, ), Column( name="Reserved3", attribute_id=21, attribute_type=AttributeType.SystemDefined, dtype=str, default_value='', - reorder_id=-1, - ), + reorder_id=-1, ), Column( name="Reserved4", attribute_id=22, attribute_type=AttributeType.SystemDefined, dtype=float, default_value=0, - reorder_id=-1, - ), + reorder_id=-1, ), Column( name="Reserved5", attribute_id=23, attribute_type=AttributeType.SystemDefined, dtype=float, default_value=0, - reorder_id=-1, - ), + reorder_id=-1, ), Column( name="Reserved6", attribute_id=24, attribute_type=AttributeType.SystemDefined, dtype=float, default_value=0, - reorder_id=-1, - ), + reorder_id=-1, ), Column( name="Level Name", attribute_id=25, attribute_type=AttributeType.SystemDefined, dtype=str, default_value='', - reorder_id=11, - ), + reorder_id=11, ), Column( name="Sample Group", attribute_id=26, attribute_type=AttributeType.SystemDefined, dtype=str, default_value='', - reorder_id=20, - ), + reorder_id=20, ), Column( name="Info.", attribute_id=27, attribute_type=AttributeType.SystemDefined, dtype=str, default_value='', - reorder_id=21, - ), - ] + reorder_id=21, ), ] }