Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging template updates 2.0.1 #218

Merged
merged 14 commits into from
Jul 26, 2021
Merged

Merging template updates 2.0.1 #218

merged 14 commits into from
Jul 26, 2021

Conversation

skrakau
Copy link
Member

@skrakau skrakau commented Jul 24, 2021 •
edited
Loading

Merge template updates 2.0.1:

  • changed a few output paths due to publish_by_id -> publish_by_meta and adjusted this accordingly in the output.md (the generation of custom paths specified before withpublish_id: 'bla_${meta.id}' did not work anymore like this)
  • adjusted .editorconfig as in template dev branch to avoid lint test to fail (nf-core/tools@d7ebfa1)
  • and changed path to testdata to https://raw.githubusercontent.com/nf-core/test-datasets instead of using https://github.com/nf-core/test-datasets/raw

(Note, I accidentally started the template updates on the wrong branch containing commits regarding Prodigal which are now already merged into dev #217. However, GitHub doesn't detect those changes in dev, but it should be fine when merging. So the commits Publish genes predicted with Prodigal in BUSCO process, Mention prodigal output in docs, Update CHANGELOG can be ignored.)

PR checklist

  • This comment contains a description of changes (with reason).
  • If you've fixed a bug or added code that should be tested, add tests!
    • If you've added a new tool - add to the software_versions process and a regex to scrape_software_versions.py
    • If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/mag/tree/master/.github/CONTRIBUTING.md)
    • If necessary, also make a PR on the nf-core/mag branch on the nf-core/test-datasets repository.
  • Make sure your code lints (nf-core lint .).
  • Ensure the test suite passes (nextflow run . -profile test,docker).
  • Usage Documentation in docs/usage.md is updated.
  • Output Documentation in docs/output.md is updated.
  • CHANGELOG.md is updated.
  • README.md is updated (including new tool citations and authors/contributors).

@github-actions
Copy link

github-actions bot commented Jul 24, 2021 •
edited
Loading

nf-core lint overall result: Passed ✅

Posted for pipeline commit 3c4148c

+| ✅ 137 tests passed       |+
#| ❔   1 tests were ignored |#

❔ Tests ignored:

  • files_unchanged - File ignored due to lint config: lib/NfcoreTemplate.groovy

✅ Tests passed:

Run details

  • nf-core/tools version 2.0.1
  • Run at 2021-07-26 07:16:17

@skrakau skrakau requested a review from ggabernet July 24, 2021 17:07
ggabernet
ggabernet approved these changes Jul 25, 2021
View reviewed changes
Copy link
Member

@ggabernet ggabernet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @skrakau, it is looking good to me, I just had a couple of comments :)

conf/docker.config Outdated Show resolved Hide resolved
nextflow.config Outdated Show resolved Hide resolved
nextflow.config Outdated Show resolved Hide resolved
nextflow.config Outdated Show resolved Hide resolved
@skrakau
Copy link
Member Author

skrakau commented Jul 26, 2021

Thanks a lot @ggabernet !

@skrakau skrakau merged commit 45286d9 into nf-core:dev Jul 26, 2021
@skrakau skrakau deleted the merging-template-updates-2.0.1 branch July 22, 2022 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ggabernet ggabernet ggabernet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@skrakau @ggabernet @KevinMenden @nf-core-bot