From 2790af50416af851c13c4dd12bb106a7f6cd420b Mon Sep 17 00:00:00 2001
From: nservant <nicolas.servant@curie.fr>
Date: Mon, 19 Dec 2022 14:00:47 +0100
Subject: [PATCH] [LINT] fix modules
---
.github/workflows/linting_comment.yml | 2 +-
modules.json | 7 +++++++
.../templates/dumpsoftwareversions.py | 8 --------
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/linting_comment.yml b/.github/workflows/linting_comment.yml
index 0bbcd30..564a8d3 100644
--- a/.github/workflows/linting_comment.yml
+++ b/.github/workflows/linting_comment.yml
@@ -25,4 +25,4 @@ jobs:
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
number: ${{ steps.pr_number.outputs.pr_number }}
- path: linting-logs/lint_results.md
+ path: linting-logs/lint_results.md
\ No newline at end of file
diff --git a/modules.json b/modules.json
index d7443e6..e2a9c3c 100644
--- a/modules.json
+++ b/modules.json
@@ -74,6 +74,13 @@
"installed_by": [
"modules"
]
+ },
+ "multiqc": {
+ "branch": "master",
+ "git_sha": "c8e35eb2055c099720a75538d1b8adb3fb5a464c",
+ "installed_by": [
+ "modules"
+ ]
}
}
},
diff --git a/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py b/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py
index a06f32b..b83b32c 100755
--- a/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py
+++ b/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py
@@ -3,19 +3,11 @@
"""Provide functions to merge multiple versions.yml files."""
-
-<<<<<<< HEAD
-import yaml
-import platform
-from textwrap import dedent
-
-=======
import platform
from textwrap import dedent
import yaml
->>>>>>> c5796cd967b920b736acba2ee60128d6ac0338db
def _make_versions_html(versions):
"""Generate a tabular HTML output of all versions for MultiQC."""
--
GitLab