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 #31

Merged
merged 5 commits into from
Apr 21, 2021
Merged

Merging template updates #31

merged 5 commits into from
Apr 21, 2021

Conversation

ErikDanielsson
Copy link

Manually merged changes from v1.13.3 version of template.

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
    • If necessary, also make a PR on the nf-core/pgdb 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 Apr 16, 2021 •
edited
Loading

nf-core lint overall result: Passed ✅ ⚠️

Posted for pipeline commit 169537c

+| ✅ 113 tests passed       |+
#| ❔   1 tests were ignored |#
!| ❗   1 tests had warnings |!

❗ Test warnings:

  • pipeline_todos - TODO string in README.md: Add citation for pipeline after first release. Uncomment lines below and update Zenodo doi.

❔ Tests ignored:

✅ Tests passed:

Run details

  • nf-core/tools version 1.13.3
  • Run at 2021-04-20 22:12:14

@ewels
Copy link
Member

ewels commented Apr 20, 2021

Accidentally duplicated your work in #30 sorry.

I picked up a few extra changes in my merge conflict resolution though, so will close this in favour of #30.

@ewels ewels closed this Apr 20, 2021
@ewels ewels reopened this Apr 20, 2021
@ewels
Copy link
Member

ewels commented Apr 20, 2021

Sigh, I had more changes because I started this a while ago and hadn't yet pulled in the latest updates on dev. Your PR is actually slightly better after that (you picked up one whitespace fix more than me 😅 ) so you win.. 🏆

@ewels ewels mentioned this pull request Apr 20, 2021
Closed
ewels
ewels approved these changes Apr 20, 2021
View reviewed changes
Copy link
Member

@ewels ewels left a comment

Choose a reason for hiding this comment

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

Looks good!

@ypriverol ypriverol merged commit 11ab4ae into nf-core:dev Apr 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ewels ewels ewels 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
@ErikDanielsson @ewels @ypriverol @nf-core-bot