Skip to content

Commit

Permalink
Merge pull request #22 from nf-core/dev
Browse files Browse the repository at this point in the history
1.0.0 release 🎉
  • Loading branch information
mashehu committed Oct 16, 2020
2 parents 731b9e0 + e46d3b7 commit 729fbcb
Show file tree
Hide file tree
Showing 62 changed files with 3,434 additions and 1,567 deletions.
5 changes: 5 additions & 0 deletions .github/.dockstore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Dockstore config version, not pipeline version
version: 1.2
workflows:
- subclass: nfl
primaryDescriptorPath: /nextflow.config
50 changes: 31 additions & 19 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,57 @@
# nf-core/cageseq: Contributing Guidelines

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

We try to manage the required tasks for nf-core/cageseq using GitHub issues, you probably came to this page when creating one. Please use the pre-filled template to save time.
We try to manage the required tasks for nf-core/cageseq 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 ;)
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/cageseq then the best place to go is the Gitter chatroom where you can ask us questions directly: https://gitter.im/nf-core/Lobby
> If you need help using or modifying nf-core/cageseq then the best place to ask is on the nf-core Slack [#cageseq](https://nfcore.slack.com/channels/cageseq) channel ([join our Slack here](https://nf-co.re/join/slack)).
## Contribution workflow
If you'd like to write some code for nf-core/cageseq, the standard workflow
is as follows:

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

1. Check that there isn't already an issue about your idea in the [nf-core/cageseq issues](https://github.com/nf-core/cageseq/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/cageseq repository](https://github.com/nf-core/cageseq) to your GitHub account
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/cageseq repository](https://github.com/nf-core/cageseq) 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/cageseq documentation](https://github.com/nf-core/cageseq#documentation) and don't hesitate to get in touch on [Gitter](https://gitter.im/nf-core/Lobby)

For further information/help, please consult the [nf-core/cageseq documentation](https://nf-co.re/cageseq/docs) and don't hesitate to get in touch on the nf-core Slack [#cageseq](https://nfcore.slack.com/channels/cageseq) channel ([join our Slack here](https://nf-co.re/join/slack)).
56 changes: 35 additions & 21 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,45 @@
<!--
# nf-core/cageseq 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:
-->

## Description of the bug

#### Describe the bug
A clear and concise description of what the bug is.
<!-- 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
A clear and concise description of what you expected to happen.
1. Command line: <!-- [e.g. `nextflow run ...`] -->
2. See error: <!-- [Please provide your error message] -->

## 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...] -->

## Nextflow Installation

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

#### 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...]
## 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/cageseq:1.0.0] -->

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

#### Additional context
Add any other context about the problem here.
<!-- Add any other context about the problem here. -->
30 changes: 20 additions & 10 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
<!--
# nf-core/cageseq 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

<!-- A clear and concise description of what the problem is. -->

<!-- e.g. [I'm always frustrated when ...] -->

## Describe the solution you'd like

<!-- A clear and concise description of what you want to happen. -->

#### 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 alternatives you've considered

#### Describe the solution you'd like
A clear and concise description of what you want to happen.
<!-- A clear and concise description of any alternative solutions or features 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.
<!-- Add any other context about the feature request here. -->
29 changes: 17 additions & 12 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
Many thanks to contributing to nf-core/cageseq!
<!--
# nf-core/cageseq 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/cageseq!
Please fill in the appropriate checklist below (delete whatever is not relevant).
These are the most common things requested on pull requests (PRs).
Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/cageseq/tree/master/.github/CONTRIBUTING.md)
-->

## 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/cageseq branch on the nf-core/test-datasets repo]( https://github.com/nf-core/test-datasets/pull/new/nf-core/cageseq)
- [ ] 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/cageseq/tree/master/.github/CONTRIBUTING.md

- [ ] This comment contains a description of changes (with reason)
- [ ] `CHANGELOG.md` is updated
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] Documentation in `docs` is updated
- [ ] If necessary, also make a PR on the [nf-core/cageseq branch on the nf-core/test-datasets repo](https://github.com/nf-core/test-datasets/pull/new/nf-core/cageseq)
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
40 changes: 40 additions & 0 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: nf-core AWS full size tests
# This workflow is triggered on push to the master branch.
# It runs the -profile 'test_full' on AWS batch

on:
release:
types: [published]

jobs:
run-awstest:
name: Run AWS full tests
if: github.repository == 'nf-core/cageseq'
runs-on: ubuntu-latest
steps:
- name: Setup Miniconda
uses: goanpeca/[email protected]
with:
auto-update-conda: true
python-version: 3.7
- name: Install awscli
run: conda install -c conda-forge awscli
- name: Start AWS batch job
# TODO nf-core: You can customise AWS full pipeline tests as required
# Add full size test data (but still relatively small datasets for few samples)
# on the `test_full.config` test runs with only one set of parameters
# Then specify `-profile test_full` instead of `-profile test` on the AWS batch command
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
TOWER_ACCESS_TOKEN: ${{ secrets.AWS_TOWER_TOKEN }}
AWS_JOB_DEFINITION: ${{ secrets.AWS_JOB_DEFINITION }}
AWS_JOB_QUEUE: ${{ secrets.AWS_JOB_QUEUE }}
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
run: |
aws batch submit-job \
--region eu-west-1 \
--job-name nf-core-cageseq \
--job-queue $AWS_JOB_QUEUE \
--job-definition $AWS_JOB_DEFINITION \
--container-overrides '{"command": ["nf-core/cageseq", "-r '"${GITHUB_SHA}"' -profile test --outdir s3://'"${AWS_S3_BUCKET}"'/cageseq/results-'"${GITHUB_SHA}"' -w s3://'"${AWS_S3_BUCKET}"'/cageseq/work-'"${GITHUB_SHA}"' -with-tower"], "environment": [{"name": "TOWER_ACCESS_TOKEN", "value": "'"$TOWER_ACCESS_TOKEN"'"}]}'
43 changes: 43 additions & 0 deletions .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: nf-core AWS test
# This workflow is triggered on push to the master branch.
# It runs the -profile 'test' on AWS batch

on:
push:
branches:
- master

jobs:
run-awstest:
name: Run AWS tests
if: github.repository == 'nf-core/cageseq'
runs-on: ubuntu-latest
steps:
- name: Setup Miniconda
uses: goanpeca/[email protected]
with:
auto-update-conda: true
python-version: 3.7
- name: Install awscli
run: conda install -c conda-forge awscli
- name: Start AWS batch job
strategy:
matrix:
# Nextflow versions: check pipeline minimum and current latest
nxf_ver: ['19.10.0', '']
aligner: ["--aligner 'bowtie1'", "--aligner 'star'"]
options: ['--skip_trimming true','--trim_ecop false','--trim_linker false','--trim_5g false','--trim_artifacts false', '--bigwig', '--remove_ribo_rna']
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
TOWER_ACCESS_TOKEN: ${{ secrets.AWS_TOWER_TOKEN }}
AWS_JOB_DEFINITION: ${{ secrets.AWS_JOB_DEFINITION }}
AWS_JOB_QUEUE: ${{ secrets.AWS_JOB_QUEUE }}
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
run: |
aws batch submit-job \
--region eu-west-1 \
--job-name nf-core-cageseq \
--job-queue $AWS_JOB_QUEUE \
--job-definition $AWS_JOB_DEFINITION \
--container-overrides '{"command": ["nf-core/cageseq", "-r '"${GITHUB_SHA}"' -profile test --outdir s3://'"${AWS_S3_BUCKET}"'/cageseq/results-'"${GITHUB_SHA}"' -w s3://'"${AWS_S3_BUCKET}"'/cageseq/work-'"${GITHUB_SHA}"' -with-tower"], "environment": [{"name": "TOWER_ACCESS_TOKEN", "value": "'"$TOWER_ACCESS_TOKEN"'"}]}
37 changes: 37 additions & 0 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: nf-core/cageseq 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-latest
steps:
# PRs to the nf-core repo master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
- name: Check PRs
if: github.repository == 'nf-core/cageseq'
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name}} == nf-core/cageseq ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
# If the above check failed, post a comment on the PR explaining the failure
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
Hi @${{ github.event.pull_request.user.login }},
It looks like this pull-request is has been made against the ${{github.event.pull_request.head.repo.full_name}} `master` branch.
The `master` branch on nf-core repositories should always contain code from the latest release.
Because of this, PRs to `master` are only allowed if they come from the ${{github.event.pull_request.head.repo.full_name}} `dev` branch.
You do not need to close this PR, you can change the target branch to `dev` by clicking the _"Edit"_ button at the top of this page.
Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false

Loading

0 comments on commit 729fbcb

Please sign in to comment.