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

Dev -> Master for 1.5 release #59

Merged
merged 29 commits into from
Dec 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e1cb675
Bump version to 1.5dev
drpatelh Nov 9, 2021
baef8fb
Merge pull request #56 from drpatelh/refactor
JoseEspinosa Nov 10, 2021
08d7c1e
Install updated syntax module from nf-core/modules
drpatelh Nov 27, 2021
1f307ce
Change version command to use task.process
drpatelh Nov 27, 2021
ab3bf4e
Install nf-core modules
drpatelh Nov 27, 2021
b1ced19
Add executor local for native groovy processes
drpatelh Nov 27, 2021
4fcd56b
Bump NF version from 21.04.0 to 21.10.3
drpatelh Nov 27, 2021
2c28be2
Move sratools modules to local due to customisation
drpatelh Nov 27, 2021
25640bd
Update CHANGELOG
drpatelh Nov 27, 2021
6e3259a
Remove params.publish_dir_mode
drpatelh Nov 27, 2021
12fcb97
Remove params.publish_dir_mode
drpatelh Nov 27, 2021
194fb72
Fix tyop in versions syntax
drpatelh Nov 27, 2021
4ee5489
Rename dumpsoftwareversions module
drpatelh Nov 27, 2021
27f7827
Bump version to 1.5
drpatelh Nov 27, 2021
c12cee0
Upgrade CI tests to those on dev
drpatelh Nov 28, 2021
e141707
Fix linting
drpatelh Nov 28, 2021
b21a617
Lint and fix repo relative to latest dev
drpatelh Nov 28, 2021
881e1f8
Fix nf-core lint
drpatelh Nov 28, 2021
eab36c9
Address review comments
drpatelh Nov 29, 2021
0c5a67b
Fix nf-core lint
drpatelh Nov 29, 2021
d9f11ac
Merge pull request #58 from drpatelh/refactor
drpatelh Nov 29, 2021
541ab9a
Change ext.suffix to ext.prefix
drpatelh Nov 29, 2021
d160263
Update date in CHANGELOG
drpatelh Nov 30, 2021
f595d51
Merge pull request #60 from drpatelh/refactor
drpatelh Nov 30, 2021
8688a82
Update contributing bullets
drpatelh Nov 30, 2021
9dfce47
Merge pull request #61 from drpatelh/refactor
drpatelh Nov 30, 2021
ad5c88a
Add pre-run script with min NF version for Tower Action
drpatelh Nov 30, 2021
586b538
Merge pull request #62 from drpatelh/refactor
drpatelh Nov 30, 2021
187c116
Update CHANGELOG.md
drpatelh Dec 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
*.config linguist-language=nextflow
modules/nf-core/** linguist-generated
subworkflows/nf-core/** linguist-generated
28 changes: 17 additions & 11 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,20 @@ For further information/help, please consult the [nf-core/fetchngs documentation

To make the nf-core/fetchngs code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written.

### Adding a new step or module
### Adding a new step

If you wish to contribute a new step or module please see the [official guidelines](https://nf-co.re/developers/adding_modules#new-module-guidelines-and-pr-review-checklist) and use the following coding standards:
If you wish to contribute a new step, please use the following coding standards:

1. Add any new flags/options to `nextflow.config` with a default (see section below).
2. Add any new flags/options to `nextflow_schema.json` with help text via `nf-core schema build`.
3. Add sanity checks for all relevant parameters.
4. Perform local tests to validate that the new code works as expected.
5. If applicable, add a new test command in `.github/workflow/ci.yml`.
6. Add any descriptions of output files to `docs/output.md`.
1. Define the corresponding input channel into your new process from the expected previous process channel
2. Write the process block (see below).
3. Define the output channel if needed (see below).
4. Add any new parameters to `nextflow.config` with a default (see below).
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool).
6. Add sanity checks and validation for all relevant parameters.
7. Perform local tests to validate that the new code works as expected.
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
9. Update MultiQC config `assets/multiqc_config.yaml` so relevant suffixes, file name clean up and module plots are in the appropriate order. If applicable, add a [MultiQC](https://https://multiqc.info/) module.
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.

### Default values

Expand All @@ -82,12 +86,14 @@ Once there, use `nf-core schema build` to add to `nextflow_schema.json`.

Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels.

### Channel naming convention
The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block.

### Naming schemes

Please use the following naming schemes, to make it easy to understand what is going where.

* Initial process channel: `ch_output_from_<process>`
* Intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`
* initial process channel: `ch_output_from_<process>`
* intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`

### Nextflow version bumping

Expand Down
63 changes: 0 additions & 63 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@

name: Bug report
description: Report something that is broken or incorrect
labels: bug
body:

- type: markdown
attributes:
value: |
Before you post this issue, please check the documentation:

- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
- [nf-core/fetchngs pipeline documentation](https://nf-co.re/fetchngs/usage)

- type: textarea
id: description
attributes:
label: Description of the bug
description: A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
id: command_used
attributes:
label: Command used and terminal output
description: Steps to reproduce the behaviour. Please paste the command you used to launch the pipeline and the output from your terminal.
render: console
placeholder: |
$ nextflow run ...

Some output where something broke

- type: textarea
id: files
attributes:
label: Relevant files
description: |
Please upload (drag and drop) and relevant files. Make into a `.zip` file if the extension is not allowed.
Your verbose log file `.nextflow.log` is often useful _(this is a hidden file in the directory where you launched the pipeline)_ as well as custom Nextflow configuration files.

- type: textarea
id: system
attributes:
label: System information
description: |
* Nextflow version _(eg. 21.10.3)_
* Hardware _(eg. HPC, Desktop, Cloud)_
* Executor _(eg. slurm, local, awsbatch)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
* Version of nf-core/fetchngs _(eg. 1.1, 1.5, 1.8.2)_
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
blank_issues_enabled: false
contact_links:
- name: Join nf-core
url: https://nf-co.re/join
Expand Down
32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Feature request
description: Suggest an idea for the nf-core/fetchngs pipeline
labels: enhancement
body:
- type: textarea
id: description
attributes:
label: Description of feature
description: Please describe your suggestion for a new feature. It might help to describe a problem or use case, plus any alternatives that you have considered.
validations:
required: true
9 changes: 6 additions & 3 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
uses: nf-core/tower-action@master
uses: nf-core/tower-action@v2

with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
bearer_token: ${{ secrets.TOWER_BEARER_TOKEN }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
pipeline: ${{ github.repository }}
revision: ${{ github.sha }}
Expand All @@ -26,4 +27,6 @@ jobs:
{
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/fetchngs/results-${{ github.sha }}"
}
profiles: '[ "test_full", "aws_tower" ]'
profiles: test_full,aws_tower
pre_run_script: 'export NXF_VER=21.10.3'

8 changes: 5 additions & 3 deletions .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Launch workflow via tower
uses: nf-core/tower-action@master
uses: nf-core/tower-action@v2

with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
bearer_token: ${{ secrets.TOWER_BEARER_TOKEN }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
pipeline: ${{ github.repository }}
revision: ${{ github.sha }}
Expand All @@ -24,4 +24,6 @@ jobs:
{
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/fetchngs/results-${{ github.sha }}"
}
profiles: '[ "test", "aws_tower" ]'
profiles: test,aws_tower
pre_run_script: 'export NXF_VER=21.10.3'

7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ on:
release:
types: [published]

# Uncomment if we need an edge release of Nextflow again
# env: NXF_EDGE: 1

jobs:
test:
name: Run workflow tests
Expand All @@ -22,7 +19,9 @@ jobs:
strategy:
matrix:
# Nextflow versions: check pipeline minimum and latest edge version
nxf_ver: ["NXF_VER=21.04.0", "NXF_EDGE=1"]
nxf_ver:
- 'NXF_VER=21.10.3'
# - 'NXF_EDGE=1'
drpatelh marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: Check out pipeline code
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linting_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
uses: dawidd6/action-download-artifact@v2
with:
workflow: linting.yml
workflow_conclusion: completed

- name: Get PR number
id: pr_number
Expand Down
5 changes: 5 additions & 0 deletions .nf-core.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
lint:
files_unchanged:
- .gitattributes
- .github/ISSUE_TEMPLATE/config.yml
- .github/workflows/linting_comment.yml
- .github/CONTRIBUTING.md
- assets/sendmail_template.txt
- lib/NfcoreSchema.groovy
- lib/NfcoreTemplate.groovy
files_exist:
- .github/ISSUE_TEMPLATE/bug_report.md
- .github/ISSUE_TEMPLATE/feature_request.md
- bin/scrape_software_versions.py
- modules/local/get_software_versions.nf
drpatelh marked this conversation as resolved.
Show resolved Hide resolved
actions_ci: False
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [[1.5](https://github.com/nf-core/fetchngs/releases/tag/1.5)] - 2021-12-01

* Finish porting the pipeline to the updated Nextflow DSL2 syntax adopted on nf-core/modules
* Bump minimum Nextflow version from `21.04.0` -> `21.10.3`
* Removed `--publish_dir_mode` as it is no longer required for the new syntax

### Enhancements & fixes

## [[1.4](https://github.com/nf-core/fetchngs/releases/tag/1.4)] - 2021-11-09

### Enhancements & fixes
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/fetchngs/results)
[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.5070524-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.5070524)

[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A521.04.0-23aa62.svg?labelColor=000000)](https://www.nextflow.io/)
[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A521.10.3-23aa62.svg?labelColor=000000)](https://www.nextflow.io/)
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)
[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)
Expand Down Expand Up @@ -48,7 +48,7 @@ The columns in the auto-created samplesheet can be tailored to be accepted out-o

## Quick Start

1. Install [`Nextflow`](https://www.nextflow.io/docs/latest/getstarted.html#installation) (`>=21.04.0`)
1. Install [`Nextflow`](https://www.nextflow.io/docs/latest/getstarted.html#installation) (`>=21.10.3`)

2. Install any of [`Docker`](https://docs.docker.com/engine/installation/), [`Singularity`](https://www.sylabs.io/guides/3.0/user-guide/), [`Podman`](https://podman.io/), [`Shifter`](https://nersc.gitlab.io/development/shifter/how-to-use/) or [`Charliecloud`](https://hpc.github.io/charliecloud/) for full pipeline reproducibility _(please only use [`Conda`](https://conda.io/miniconda.html) as a last resort; see [docs](https://nf-co.re/usage/configuration#basic-configuration-profiles))_

Expand Down
Loading