Skip to content

Commit

Permalink
Merge pull request #29 from nf-core/dev
Browse files Browse the repository at this point in the history
PR for 1.1 release
  • Loading branch information
maxibor authored Apr 29, 2020
2 parents e69aa3d + 6821314 commit 7dc3362
Show file tree
Hide file tree
Showing 50 changed files with 2,348 additions and 3,461 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
work
results
.nextflow.log*
52 changes: 31 additions & 21 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,47 +1,57 @@
# nf-core/coproid: Contributing Guidelines

Hi there! Many thanks for taking an interest in improving nf-core/coproid.
Hi there!
Many thanks for taking an interest in improving nf-core/coproid.

We try to manage the required tasks for nf-core/coproid using GitHub issues, you probably came to this page when creating one. Please use the pre-filled template to save time.

However, don't be put off by this template - other more general issues and suggestions are welcome! Contributions to the code are even more welcome ;)

> If you need help using or modifying nf-core/coproid then the best place to ask is on the pipeline channel on [Slack](https://nf-core-invite.herokuapp.com/).
We try to manage the required tasks for nf-core/coproid using GitHub issues, you probably came to this page when creating one.
Please use the pre-filled template to save time.

However, don't be put off by this template - other more general issues and suggestions are welcome!
Contributions to the code are even more welcome ;)

> If you need help using or modifying nf-core/coproid then the best place to ask is on the nf-core Slack [#coproid](https://nfcore.slack.com/channels/coproid) channel ([join our Slack here](https://nf-co.re/join/slack)).
## Contribution workflow
If you'd like to write some code for nf-core/coproid, the standard workflow
is as follows:

1. Check that there isn't already an issue about your idea in the
[nf-core/coproid issues](https://github.com/nf-core/coproid/issues) to avoid
duplicating work.
If you'd like to write some code for nf-core/coproid, the standard workflow is as follows:

1. Check that there isn't already an issue about your idea in the [nf-core/coproid issues](https://github.com/nf-core/coproid/issues) to avoid duplicating work
* If there isn't one already, please create one so that others know you're working on this
2. Fork the [nf-core/coproid repository](https://github.com/nf-core/coproid) to your GitHub account
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/coproid repository](https://github.com/nf-core/coproid) to your GitHub account
3. Make the necessary changes / additions within your forked repository
4. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged.

If you're not used to this workflow with git, you can start with some [basic docs from GitHub](https://help.github.com/articles/fork-a-repo/) or even their [excellent interactive tutorial](https://try.github.io/).
4. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged

If you're not used to this workflow with git, you can start with some [docs from GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests) or even their [excellent `git` resources](https://try.github.io/).

## Tests
When you create a pull request with changes, [Travis CI](https://travis-ci.org/) will run automatic tests.

When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.

There are typically two types of tests that run:

### Lint Tests
The nf-core has a [set of guidelines](http://nf-co.re/guidelines) which all pipelines must adhere to.

`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core lint <pipeline-directory>` command.

If any failures or warnings are encountered, please follow the listed URL for more documentation.

### Pipeline Tests
Each nf-core pipeline should be set up with a minimal set of test-data.
Travis CI then runs the pipeline on this data to ensure that it exists successfully.

Each `nf-core` pipeline should be set up with a minimal set of test-data.
`GitHub Actions` then runs the pipeline on this data to ensure that it exits successfully.
If there are any failures then the automated tests fail.
These tests are run both with the latest available version of Nextflow and also the minimum required version that is stated in the pipeline code.
These tests are run both with the latest available version of `Nextflow` and also the minimum required version that is stated in the pipeline code.

## Patch

: warning: Only in the unlikely and regretful event of a release happening with a bug.

* On your own fork, make a new branch `patch` based on `upstream/master`.
* Fix the bug, and bump version (X.Y.Z+1).
* A PR should be made on `master` from patch to directly this particular bug.

## Getting help
For further information/help, please consult the [nf-core/coproid documentation](https://github.com/nf-core/coproid#documentation) and don't hesitate to get in touch on the pipeline channel on [Slack](https://nf-core-invite.herokuapp.com/).

For further information/help, please consult the [nf-core/coproid documentation](https://nf-co.re/nf-core/coproid/docs) and don't hesitate to get in touch on the nf-core Slack [#coproid](https://nfcore.slack.com/channels/coproid) channel ([join our Slack here](https://nf-co.re/join/slack)).
43 changes: 27 additions & 16 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,42 @@
# nf-core/coproid bug report

Hi there!

Thanks for telling us about a problem with the pipeline. Please delete this text and anything that's not relevant from the template below:
Thanks for telling us about a problem with the pipeline.
Please delete this text and anything that's not relevant from the template below:

## Describe the bug

#### Describe the bug
A clear and concise description of what the bug is.

#### Steps to reproduce
## Steps to reproduce

Steps to reproduce the behaviour:

1. Command line: `nextflow run ...`
2. See error: _Please provide your error message_

#### Expected behaviour
## Expected behaviour

A clear and concise description of what you expected to happen.

#### System:
- Hardware: [e.g. HPC, Desktop, Cloud...]
- Executor: [e.g. slurm, local, awsbatch...]
- OS: [e.g. CentOS Linux, macOS, Linux Mint...]
- Version [e.g. 7, 10.13.6, 18.3...]
## System

- Hardware: <!-- [e.g. HPC, Desktop, Cloud...] -->
- Executor: <!-- [e.g. slurm, local, awsbatch...] -->
- OS: <!-- [e.g. CentOS Linux, macOS, Linux Mint...] -->
- Version <!-- [e.g. 7, 10.13.6, 18.3...] -->

## Nextflow Installation

- Version: <!-- [e.g. 19.10.0] -->

## Container engine

#### Nextflow Installation:
- Version: [e.g. 0.31.0]
- Engine: <!-- [e.g. Conda, Docker or Singularity] -->
- version: <!-- [e.g. 1.0.0] -->
- Image tag: <!-- [e.g. nfcore/coproid:1.0.0] -->

#### Container engine:
- Engine: [e.g. Conda, Docker or Singularity]
- version: [e.g. 1.0.0]
- Image tag: [e.g. nfcore/coproid:1.0.0]
## Additional context

#### Additional context
Add any other context about the problem here.
18 changes: 13 additions & 5 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
# nf-core/coproid feature request

Hi there!

Thanks for suggesting a new feature for the pipeline! Please delete this text and anything that's not relevant from the template below:
Thanks for suggesting a new feature for the pipeline!
Please delete this text and anything that's not relevant from the template below:

## Is your feature request related to a problem? Please describe

#### Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is.

Ex. I'm always frustrated when [...]

#### Describe the solution you'd like
## Describe the solution you'd like

A clear and concise description of what you want to happen.

#### Describe alternatives you've considered
## Describe alternatives you've considered

A clear and concise description of any alternative solutions or features you've considered.

#### Additional context
## Additional context

Add any other context about the feature request here.
25 changes: 14 additions & 11 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
Many thanks to contributing to nf-core/coproid!
# nf-core/coproid pull request

Please fill in the appropriate checklist below (delete whatever is not relevant). These are the most common things requested on pull requests (PRs).
Many thanks for contributing to nf-core/coproid!

Please fill in the appropriate checklist below (delete whatever is not relevant).
These are the most common things requested on pull requests (PRs).

## 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 necessary, also make a PR on the [nf-core/coproid branch on the nf-core/test-datasets repo]( https://github.com/nf-core/test-datasets/pull/new/nf-core/coproid)
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Make sure your code lints (`nf-core lint .`).
- [ ] Documentation in `docs` is updated
- [ ] `CHANGELOG.md` is updated
- [ ] `README.md` is updated
- [ ] 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 necessary, also make a PR on the [nf-core/coproid branch on the nf-core/test-datasets repo](https://github.com/nf-core/test-datasets/pull/new/nf-core/coproid)
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
- [ ] Make sure your code lints (`nf-core lint .`).
- [ ] Documentation in `docs` is updated
- [ ] `CHANGELOG.md` is updated
- [ ] `README.md` is updated

**Learn more about contributing:** https://github.com/nf-core/coproid/tree/master/.github/CONTRIBUTING.md
**Learn more about contributing:** [CONTRIBUTING.md](https://github.com/nf-core/coproid/tree/master/.github/CONTRIBUTING.md)
4 changes: 0 additions & 4 deletions .github/markdownlint.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Markdownlint configuration file
default: true,
line-length: false
no-multiple-blanks: 0
blanks-around-headers: false
blanks-around-lists: false
header-increment: false
no-duplicate-header:
siblings_only: true
16 changes: 16 additions & 0 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: nf-core branch protection
# This workflow is triggered on PRs to master branch on the repository
# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
on:
pull_request:
branches:
- master

jobs:
test:
runs-on: ubuntu-18.04
steps:
# PRs are only ok if coming from an nf-core `dev` branch or a fork `patch` branch
- name: Check PRs
run: |
{ [[ $(git remote get-url origin) == *nf-core/coproid ]] && [[ ${GITHUB_HEAD_REF} = "dev" ]]; } || [[ ${GITHUB_HEAD_REF} == "patch" ]]
28 changes: 28 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: nf-core CI
# This workflow is triggered on pushes and PRs to the repository.
# It runs the pipeline with the minimal test dataset to check that it completes without any syntax errors
on: [push, pull_request]

jobs:
test:
env:
NXF_VER: ${{ matrix.nxf_ver }}
NXF_ANSI_LOG: false
runs-on: ubuntu-latest
strategy:
matrix:
# Nextflow versions: check pipeline minimum and current latest
nxf_ver: ['19.10.0', '']
steps:
- uses: actions/checkout@v2
- name: Install Nextflow
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- name: Pull docker image
run: |
docker pull nfcore/coproid:dev
docker tag nfcore/coproid:dev nfcore/coproid:1.1
- name: Run pipeline with test data
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker
50 changes: 50 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: nf-core linting
# This workflow is triggered on pushes and PRs to the repository.
# It runs the `nf-core lint` and markdown lint tests to ensure that the code meets the nf-core guidelines
on:
push:
pull_request:
release:
types: [published]

jobs:
Markdown:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '10'
- name: Install markdownlint
run: npm install -g markdownlint-cli
- name: Run Markdownlint
run: markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml
YAML:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '10'
- name: Install yaml-lint
run: npm install -g yaml-lint
- name: Run yaml-lint
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml")
nf-core:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install Nextflow
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- uses: actions/setup-python@v1
with:
python-version: '3.6'
architecture: 'x64'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install nf-core
- name: Run nf-core lint
run: nf-core lint ${GITHUB_WORKSPACE}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
work/
results/
.DS_Store
tests/test_data
tests/
testing/
*.pyc
*.ipynb_checkpoints
docs/build/
test/
_build
_static
_templates
.vscode
45 changes: 0 additions & 45 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit 7dc3362

Please sign in to comment.