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.

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

Merge dev and dsl2 #334

Merged
merged 237 commits into from
Jan 27, 2021
Merged

Merge dev and dsl2 #334

merged 237 commits into from
Jan 27, 2021

Conversation

maxulysse
Copy link
Member

Syncing dev into the current dsl2 branch, so that way it'll be easy to keep the history of everything, and at some point merge back dsl2 into dev.
Also added bonus is up to date 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/sarek 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/workflows/ci.yml Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
environment.yml Outdated Show resolved Hide resolved
main.nf Show resolved Hide resolved
main.nf Outdated Show resolved Hide resolved
nextflow.config Outdated Show resolved Hide resolved
@maxulysse maxulysse closed this Jan 26, 2021
@maxulysse maxulysse deleted the branch nf-core:dsl2 January 26, 2021 20:36
@maxulysse maxulysse reopened this Jan 26, 2021
@maxulysse maxulysse added the DSL2 label Jan 26, 2021
@maxulysse maxulysse requested a review from a team January 27, 2021 08:36
@maxulysse maxulysse merged commit 8a7cb68 into nf-core:dsl2 Jan 27, 2021
@maxulysse maxulysse deleted the dsl2_dev_merge branch January 27, 2021 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants