Skip to content

Commit e5ce6ce

Browse files
authored
Merge pull request #2349 from nf-core/dev
Dev -> Master for v2.9
2 parents 0912990 + d74b909 commit e5ce6ce

File tree

97 files changed

+4895
-3496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+4895
-3496
lines changed

.github/CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,3 @@ To get started:
142142
Devcontainer specs:
143143

144144
- [DevContainer config](.devcontainer/devcontainer.json)
145-
- [Dockerfile](.devcontainer/Dockerfile)

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ body:
3333
attributes:
3434
label: System information
3535
description: |
36-
* Nextflow version _(eg. 22.10.1)_
36+
* Nextflow version _(eg. 23.04.0)_
3737
* Hardware _(eg. HPC, Desktop, Cloud)_
3838
* Executor _(eg. slurm, local, awsbatch)_
3939
* OS _(eg. CentOS Linux, macOS, Linux Mint)_

.github/workflows/create-lint-wf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
NXF_VER:
26-
- "22.10.1"
26+
- "23.04.0"
2727
- "latest-everything"
2828
steps:
2929
# Get the repo code
Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
name: Create a pipeline from a template and test it
2+
on:
3+
push:
4+
branches:
5+
- dev
6+
paths:
7+
- nf_core/pipeline-template/**
8+
pull_request:
9+
release:
10+
types: [published]
11+
12+
# Cancel if a newer run is started
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
15+
cancel-in-progress: true
16+
17+
env:
18+
NXF_ANSI_LOG: false
19+
20+
jobs:
21+
RunTestWorkflow:
22+
runs-on: ubuntu-latest
23+
env:
24+
NXF_ANSI_LOG: false
25+
strategy:
26+
matrix:
27+
TEMPLATE:
28+
- "template_skip_all.yml"
29+
- "template_skip_github_badges.yml"
30+
- "template_skip_igenomes.yml"
31+
- "template_skip_ci.yml"
32+
- "template_skip_nf_core_configs.yml"
33+
34+
steps:
35+
- uses: actions/checkout@v3
36+
name: Check out source-code repository
37+
38+
- name: Set up Python 3.8
39+
uses: actions/setup-python@v4
40+
with:
41+
python-version: 3.8
42+
43+
- name: Install python dependencies
44+
run: |
45+
python -m pip install --upgrade pip
46+
pip install .
47+
48+
- name: Install Nextflow
49+
uses: nf-core/setup-nextflow@v1
50+
with:
51+
version: latest-everything
52+
53+
# Install the Prettier linting tools
54+
- uses: actions/setup-node@v3
55+
56+
- name: Install Prettier
57+
run: npm install -g prettier
58+
59+
# Install the editorconfig linting tools
60+
- name: Install editorconfig-checker
61+
run: npm install -g editorconfig-checker
62+
63+
# Create template files
64+
- name: Create template skip all (except github)
65+
run: |
66+
printf "prefix: my-prefix\nskip: ['ci', 'github_badges', 'igenomes', 'nf_core_configs']" > template_skip_all.yml
67+
68+
- name: Create template skip github_badges
69+
run: |
70+
printf "prefix: my-prefix\nskip: github_badges" > template_skip_github_badges.yml
71+
72+
- name: Create template skip igenomes
73+
run: |
74+
printf "prefix: my-prefix\nskip: igenomes" > template_skip_igenomes.yml
75+
76+
- name: Create template skip ci
77+
run: |
78+
printf "prefix: my-prefix\nskip: ci" > template_skip_ci.yml
79+
80+
- name: Create template skip nf_core_configs
81+
run: |
82+
printf "prefix: my-prefix\nskip: nf_core_configs" > template_skip_nf_core_configs.yml
83+
84+
# Create a pipeline from the template
85+
- name: create a pipeline from the template ${{ matrix.TEMPLATE }}
86+
run: |
87+
nf-core --log-file log.txt create -n testpipeline -d "This pipeline is for testing" -a "Testing McTestface" --template-yaml ${{ matrix.TEMPLATE }}
88+
89+
- name: run the pipeline
90+
run: |
91+
nextflow run my-prefix-testpipeline -profile test,docker --outdir ./results
92+
93+
# Remove results folder before linting
94+
- name: remove results folder
95+
run: |
96+
rm -rf ./results
97+
98+
# Try syncing it before we change anything
99+
- name: nf-core sync
100+
run: nf-core --log-file log.txt sync --dir my-prefix-testpipeline/ --template-yaml ${{ matrix.TEMPLATE }}
101+
102+
# Run code style linting
103+
- name: Run Prettier --check
104+
run: prettier --check my-prefix-testpipeline
105+
106+
- name: Run ECLint check
107+
run: editorconfig-checker -exclude README.md $(find my-prefix-testpipeline/.* -type f | grep -v '.git\|.py\|md\|json\|yml\|yaml\|html\|css\|work\|.nextflow\|build\|nf_core.egg-info\|log.txt\|Makefile')
108+
109+
# Remove TODO statements
110+
- name: remove TODO
111+
run: find my-prefix-testpipeline -type f -exec sed -i '/TODO nf-core:/d' {} \;
112+
113+
# Replace zenodo.XXXXXX to pass readme linting
114+
- name: replace zenodo.XXXXXX
115+
run: find my-prefix-testpipeline -type f -exec sed -i 's/zenodo.XXXXXX/zenodo.123456/g' {} \;
116+
117+
# Run nf-core linting
118+
- name: nf-core lint
119+
run: nf-core --log-file log.txt --hide-progress lint --dir my-prefix-testpipeline --fail-warned
120+
121+
# Run bump-version
122+
- name: nf-core bump-version
123+
run: nf-core --log-file log.txt bump-version --dir my-prefix-testpipeline/ 1.1
124+
125+
# Run nf-core linting in release mode
126+
- name: nf-core lint in release mode
127+
run: nf-core --log-file log.txt --hide-progress lint --dir my-prefix-testpipeline --fail-warned --release
128+
129+
- name: Tar files
130+
run: tar -cvf artifact_files.tar log.txt template_skip*.yml
131+
132+
- name: Upload log file artifact
133+
if: ${{ always() }}
134+
uses: actions/upload-artifact@v3
135+
with:
136+
name: nf-core-log-file
137+
path: artifact_files.tar

.github/workflows/create-test-wf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
NXF_VER:
26-
- "22.10.1"
26+
- "23.04.0"
2727
- "latest-everything"
2828
steps:
2929
- uses: actions/checkout@v3

.github/workflows/pytest-frozen-ubuntu-20.04.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18-
pytest:
18+
pytest-frozen:
1919
runs-on: ubuntu-20.04
2020
steps:
2121
- uses: actions/checkout@v3

.gitpod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ tasks:
55
python -m pip install -e .
66
python -m pip install -r requirements-dev.txt
77
pre-commit install --install-hooks
8+
nextflow self-update
89
vscode:
910
extensions: # based on nf-core.nf-core-extensionpack
1011
- codezombiech.gitignore # Language support for .gitignore files

CHANGELOG.md

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,73 @@
11
# nf-core/tools: Changelog
22

3+
# [v2.9 - Chromium Falcon](https://github.com/nf-core/tools/releases/tag/2.9) + [2023-06-29]
4+
5+
### Template
6+
7+
- `params.max_multiqc_email_size` is no longer required ([#2273](https://github.com/nf-core/tools/pull/2273))
8+
- Remove `cleanup = true` from `test_full.config` in pipeline template ([#2279](https://github.com/nf-core/tools/pull/2279))
9+
- Fix usage docs for specifying `params.yaml` ([#2279](https://github.com/nf-core/tools/pull/2279))
10+
- Added stub in modules template ([#2277])(https://github.com/nf-core/tools/pull/2277) [Contributed by @nvnieuwk]
11+
- Move registry definitions out of profile scope ([#2286])(https://github.com/nf-core/tools/pull/2286)
12+
- Remove `aws_tower` profile ([#2287])(https://github.com/nf-core/tools/pull/2287)
13+
- Fixed the Slack report to include the pipeline name ([#2291](https://github.com/nf-core/tools/pull/2291))
14+
- Fix link in the MultiQC report to point to exact version of output docs ([#2298](https://github.com/nf-core/tools/pull/2298))
15+
- Updates seqeralabs/action-tower-launch to v2.0.0 ([#2301](https://github.com/nf-core/tools/pull/2301))
16+
- Remove schema validation from `lib` folder and use Nextflow [nf-validation plugin](https://nextflow-io.github.io/nf-validation/) instead ([#1771](https://github.com/nf-core/tools/pull/1771/))
17+
- Fix parsing of container directive when it is not typical nf-core format ([#2306](https://github.com/nf-core/tools/pull/2306))
18+
- Add ability to specify custom registry for linting modules, defaults to quay.io ([#2313](https://github.com/nf-core/tools/pull/2313))
19+
- Add `singularity.registry = 'quay.io'` in pipeline template ([#2305](https://github.com/nf-core/tools/pull/2305))
20+
- Add `apptainer.registry = 'quay.io'` in pipeline template ([#2352](https://github.com/nf-core/tools/pull/2352))
21+
- Bump minimum required NF version in pipeline template from `22.10.1` -> `23.04.0` ([#2305](https://github.com/nf-core/tools/pull/2305))
22+
- Add ability to interpret `docker.registry` from `nextflow.config` file. If not found defaults to quay.io. ([#2318](https://github.com/nf-core/tools/pull/2318))
23+
- Add functions to dynamically include pipeline tool citations in MultiQC methods description section for better reporting. ([#2326](https://github.com/nf-core/tools/pull/2326))
24+
- Remove `--tracedir` parameter ([#2290](https://github.com/nf-core/tools/pull/2290))
25+
- Incorrect config parameter warnings when customising pipeline template ([#2333](https://github.com/nf-core/tools/pull/2333))
26+
- Use markdown syntax in the description for the meta map channels ([#2358](https://github.com/nf-core/tools/pull/2358))
27+
28+
### Download
29+
30+
- Introduce a `--tower` flag for `nf-core download` to obtain pipelines in an offline format suited for [seqeralabs® Nextflow Tower](https://cloud.tower.nf/) ([#2247](https://github.com/nf-core/tools/pull/2247)).
31+
- Refactored the CLI for `--singularity-cache` in `nf-core download` from a flag to an argument. The prior options were renamed to `amend` (container images are only saved in the `$NXF_SINGULARITY_CACHEDIR`) and `copy` (a copy of the image is saved with the download). `remote` was newly introduced and allows to provide a table of contents of a remote cache via an additional argument `--singularity-cache-index` ([#2247](https://github.com/nf-core/tools/pull/2247)).
32+
- Refactored the CLI parameters related to container images. Although downloading other images than those of the Singularity/Apptainer container system is not supported for the time being, a generic name for the parameters seemed preferable. So the new parameter `--singularity-cache-index` introduced in [#2247](https://github.com/nf-core/tools/pull/2247) has been renamed to `--container-cache-index` prior to release ([#2336](https://github.com/nf-core/tools/pull/2336)).
33+
- To address issue [#2311](https://github.com/nf-core/tools/issues/2311), a new parameter `--container-library` was created allowing to specify the container library (registry) from which container images in OCI format (Docker) should be pulled ([#2336](https://github.com/nf-core/tools/pull/2336)).
34+
- Container detection in configs was improved. This allows for DSL2-like container definitions inside the container parameter value provided to process scopes [#2346](https://github.com/nf-core/tools/pull/2346).
35+
- Add apptainer to the list of false positve container strings ([#2353](https://github.com/nf-core/tools/pull/2353)).
36+
37+
#### Updated CLI parameters
38+
39+
| Old parameter | New parameter |
40+
| --------------------- | ---------------------------------------------- |
41+
| new parameter | `-d` / `--download-configuration` |
42+
| new parameter | `-t` / `--tower` |
43+
| `-c`/ `--container` | `-s` / `--container-system <VALUE>` |
44+
| new parameter | `-l` / `--container-library <VALUE>` |
45+
| `--singularity-cache` | `-u` / `--container-cache-utilisation <VALUE>` |
46+
| new parameter | `-i` / `--container-cache-index <VALUE>` |
47+
48+
_In addition, `-r` / `--revision` has been changed to a parameter that can be provided multiple times so several revisions can be downloaded at once._
49+
50+
### Linting
51+
52+
- Warn if container access is denied ([#2270](https://github.com/nf-core/tools/pull/2270))
53+
- Error if module container specification has quay.io as prefix when it shouldn't have ([#2278])(https://github.com/nf-core/tools/pull/2278/files)
54+
- Detect if container is 'simple name' and try to contact quay.io server by default ([#2281](https://github.com/nf-core/tools/pull/2281))
55+
- Warn about null/None/empty default values in `nextflow_schema.json` ([#3328](https://github.com/nf-core/tools/pull/2328))
56+
- Fix linting when creating a pipeline skipping some parts of the template and add CI test ([#2330](https://github.com/nf-core/tools/pull/2330))
57+
58+
### Modules
59+
60+
- Don't update `modules_json` object if a module is not updated ([#2323](https://github.com/nf-core/tools/pull/2323))
61+
62+
### Subworkflows
63+
64+
### General
65+
66+
- GitPod base image: Always self-update to the latest version of Nextflow. Add [pre-commit](https://pre-commit.com/) dependency.
67+
- GitPod configs: Update Nextflow as an init task, init pre-commit in pipeline config.
68+
- Refgenie: Create `nxf_home/nf-core/refgenie_genomes.config` path if it doesn't exist ([#2312](https://github.com/nf-core/tools/pull/2312))
69+
- Add CI tests to test running a pipeline whe it's created from a template skipping different areas
70+
371
# [v2.8 - Ruthenium Monkey](https://github.com/nf-core/tools/releases/tag/2.8) - [2023-04-27]
472

573
### Template

0 commit comments

Comments
 (0)