From 50a67bc5381ff1aad674bf44d1d548f92fde3d5e Mon Sep 17 00:00:00 2001 From: nuwang <2070605+nuwang@users.noreply.github.com> Date: Fri, 31 Mar 2023 15:41:17 +0530 Subject: [PATCH] Fix formatter ordering of inherits field --- tests/fixtures/formatter/formatter-tool-sort-order-formatted.yml | 1 + tests/fixtures/formatter/formatter-tool-sort-order-input.yml | 1 + tpv/commands/formatter.py | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/fixtures/formatter/formatter-tool-sort-order-formatted.yml b/tests/fixtures/formatter/formatter-tool-sort-order-formatted.yml index 455767c..87cac82 100644 --- a/tests/fixtures/formatter/formatter-tool-sort-order-formatted.yml +++ b/tests/fixtures/formatter/formatter-tool-sort-order-formatted.yml @@ -11,6 +11,7 @@ tools: rank: | helpers.weighted_random_sampling(candidate_destinations) toolshed.g2.bx.psu.edu/repos/iuc/mothur_shhh_seqs/mothur_shhh_seqs/.*: + inherits: wig_to_bigWig cores: 2 mem: 20 env: diff --git a/tests/fixtures/formatter/formatter-tool-sort-order-input.yml b/tests/fixtures/formatter/formatter-tool-sort-order-input.yml index d77d1ea..039d265 100644 --- a/tests/fixtures/formatter/formatter-tool-sort-order-input.yml +++ b/tests/fixtures/formatter/formatter-tool-sort-order-input.yml @@ -18,5 +18,6 @@ tools: toolshed.g2.bx.psu.edu/repos/iuc/mothur_shhh_seqs/mothur_shhh_seqs/.*: cores: 2 mem: 20 + inherits: wig_to_bigWig env: TERM: vt100 diff --git a/tpv/commands/formatter.py b/tpv/commands/formatter.py index 40442bf..cadcbf4 100644 --- a/tpv/commands/formatter.py +++ b/tpv/commands/formatter.py @@ -80,6 +80,7 @@ def format(self): basic_entity_sort_order = { 'id': {}, + 'inherits': {}, 'if': {}, 'context': {}, 'gpus': {},