Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
### Linting

- Warn if `manifest.diagram` is not set, and fail if it is not a relative path to an existing image file ([#4460](https://github.com/nf-core/tools/pull/4460))
- Add strandeness to permitted meta keys ([#4473](https://github.com/nf-core/tools/pull/4473))

### Modules

Expand Down
2 changes: 1 addition & 1 deletion nf_core/modules/lint/main_nf.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def check_script_section(self, lines):
)

# Validate meta keys
permitted_meta_keys = {"id", "single_end"}
permitted_meta_keys = {"id", "single_end", "strandedness"}
invalid_meta_keys = [
f"{prefix}{key}"
for prefix, key in re.findall(r"(?<!\.)\b(meta\d*\??\.)(\w+)\b(?!\()", script)
Expand Down
5 changes: 3 additions & 2 deletions tests/modules/lint/test_main_nf.py
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,7 @@ def test_validate_meta_keys():
"""
def prefix = "${meta.id}"
def se = meta.single_end
def strand = meta.strandedness
def id = meta.subMap(['id'])
def m2id = meta2?.id
"""
Expand All @@ -1194,14 +1195,14 @@ def m2id = meta2?.id
[
"""
def sample = meta.sample
def strand = meta.strandedness
def region = meta.region
def m2opts = meta2?.options
"""
],
)
assert len(mock_lint.failed) == 1
assert "meta.sample" in mock_lint.failed[0][2]
assert "meta.strandedness" in mock_lint.failed[0][2]
assert "meta.region" in mock_lint.failed[0][2]
assert "meta2?.options" in mock_lint.failed[0][2]

# meta2/meta3 with valid keys
Expand Down
Loading