From 64815e2bd5fb2b0ee5a9f1c89ba13f6ab0f9ecbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20H=C3=B6rtenhuber?= Date: Wed, 23 Mar 2022 16:42:23 +0100 Subject: [PATCH 1/4] remove left-over traces of markownlint --- nf_core/lint/files_exist.py | 4 +--- nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/nf_core/lint/files_exist.py b/nf_core/lint/files_exist.py index f1c372672d..7dc2fcf326 100644 --- a/nf_core/lint/files_exist.py +++ b/nf_core/lint/files_exist.py @@ -81,7 +81,6 @@ def files_exist(self): .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md docs/images/nf-core-PIPELINE_logo.png - .markdownlint.yml Files that *should not* be present: @@ -162,8 +161,7 @@ def files_exist(self): os.path.join(".github", "workflows", "push_dockerhub.yml"), os.path.join(".github", "ISSUE_TEMPLATE", "bug_report.md"), os.path.join(".github", "ISSUE_TEMPLATE", "feature_request.md"), - os.path.join("docs", "images", f"nf-core-{short_name}_logo.png"), - ".markdownlint.yml", + os.path.join("docs", "images", f"nf-core-{short_name}_logo.png") ] files_warn_ifexists = [".travis.yml"] diff --git a/nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md b/nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md index 3047cba874..7a015ef30e 100644 --- a/nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md +++ b/nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md @@ -10,8 +10,6 @@ Remember that PRs should be made against the dev branch, unless you're preparing Learn more about contributing: [CONTRIBUTING.md](https://github.com/{{ name }}/tree/master/.github/CONTRIBUTING.md) --> - - ## PR checklist - [ ] This comment contains a description of changes (with reason). From f0066f2a7c045dddddbf67642e2021ea523be284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20H=C3=B6rtenhuber?= Date: Wed, 23 Mar 2022 16:44:33 +0100 Subject: [PATCH 2/4] =?UTF-8?q?fix=20linting=20=F0=9F=99=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md b/nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md index 7a015ef30e..7759916864 100644 --- a/nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md +++ b/nf_core/pipeline-template/.github/PULL_REQUEST_TEMPLATE.md @@ -10,6 +10,7 @@ Remember that PRs should be made against the dev branch, unless you're preparing Learn more about contributing: [CONTRIBUTING.md](https://github.com/{{ name }}/tree/master/.github/CONTRIBUTING.md) --> + ## PR checklist - [ ] This comment contains a description of changes (with reason). From 1e823edcc3213ddfc27d6634c1d9e83a763b7f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20H=C3=B6rtenhuber?= Date: Wed, 23 Mar 2022 16:46:57 +0100 Subject: [PATCH 3/4] fix black linting --- nf_core/lint/files_exist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nf_core/lint/files_exist.py b/nf_core/lint/files_exist.py index 7dc2fcf326..eb0673d7fd 100644 --- a/nf_core/lint/files_exist.py +++ b/nf_core/lint/files_exist.py @@ -161,7 +161,7 @@ def files_exist(self): os.path.join(".github", "workflows", "push_dockerhub.yml"), os.path.join(".github", "ISSUE_TEMPLATE", "bug_report.md"), os.path.join(".github", "ISSUE_TEMPLATE", "feature_request.md"), - os.path.join("docs", "images", f"nf-core-{short_name}_logo.png") + os.path.join("docs", "images", f"nf-core-{short_name}_logo.png"), ] files_warn_ifexists = [".travis.yml"] From 9ab94f19cfa4d90b51efc908a51843fa1d6c18e3 Mon Sep 17 00:00:00 2001 From: Phil Ewels Date: Thu, 24 Mar 2022 09:31:14 +0100 Subject: [PATCH 4/4] Add back .markdownlint.yml to disallowed files, also add .yamllint.yml --- nf_core/lint/files_exist.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nf_core/lint/files_exist.py b/nf_core/lint/files_exist.py index eb0673d7fd..74693d03e3 100644 --- a/nf_core/lint/files_exist.py +++ b/nf_core/lint/files_exist.py @@ -81,6 +81,8 @@ def files_exist(self): .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md docs/images/nf-core-PIPELINE_logo.png + .markdownlint.yml + .yamllint.yml Files that *should not* be present: @@ -162,6 +164,8 @@ def files_exist(self): os.path.join(".github", "ISSUE_TEMPLATE", "bug_report.md"), os.path.join(".github", "ISSUE_TEMPLATE", "feature_request.md"), os.path.join("docs", "images", f"nf-core-{short_name}_logo.png"), + ".markdownlint.yml", + ".yamllint.yml", ] files_warn_ifexists = [".travis.yml"]