Skip to content

Commit bcb064b

Browse files
authored
Adapt for Nextflow 25.10.2 (#68)
* Adapt pipeline for nextflow 25.10.2 * Update dev instructions regarding creating virtual env * Update PR template * Update GHAs
1 parent b75b3d9 commit bcb064b

File tree

4 files changed

+22
-32
lines changed

4 files changed

+22
-32
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
**What problems does this PR solve?**
2-
Provide a short description or reference to the relevant issue, explaining what problems this PR solves.
1+
**Description**
32

4-
**An outline of the validation procedure for this feature**
5-
In addition to automatic tests, has any manual testing been carried out?
63

7-
**Risk analysis - Reasons for careful code review**
8-
If any of the boxes below are checked, extra careful code review should be inititated.
4+
**Risk analysis**
95

10-
- [ ] This PR contains code that could remove data
6+
7+
**Validation procedure**

.github/workflows/run_tests.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,31 @@ jobs:
44
run-tests:
55
runs-on: ubuntu-22.04
66
env:
7-
NXF_VER: 21.04.1
7+
NXF_VER: 25.10.2
88
NXF_ANSI_LOG: false
99
steps:
1010
- name: Check out repository code
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v6
1212

13-
- name: Cache singularity images
14-
uses: actions/cache@v4.2.2
13+
- name: Cache singularity/apptainer images
14+
uses: actions/cache@v5.0.2
1515
with:
1616
path: work/singularity
1717
key: singularity-${{ hashFiles('config/nextflow_config/singularity.config') }}
1818
restore-keys: singularity-
1919

20-
- name: Install Singularity
21-
uses: eWaterCycle/setup-singularity@v7
20+
- name: Install apptainer
21+
uses: eWaterCycle/setup-apptainer@v2
2222
with:
23-
singularity-version: 3.8.3
24-
25-
- name: Install Nextflow
26-
env:
27-
CAPSULE_LOG: none
28-
run: |
29-
curl -fsSL https://github.com/nextflow-io/nextflow/releases/download/v24.10.4/nextflow -o nextflow | bash
30-
sudo mv nextflow /usr/local/bin/
31-
32-
- name: Make Nextflow binary executable
33-
run: chmod +x /usr/local/bin/nextflow
23+
apptainer-version: 1.3.6
3424

25+
- name: Install Nextflow
26+
uses: nf-core/setup-nextflow@v2
27+
with:
28+
version: 25.10.2
29+
3530
- name: Set up python
36-
uses: actions/setup-python@v2
31+
uses: actions/setup-python@v6
3732
with:
3833
python-version: 3.11
3934
architecture: x64

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This is a Nextflow pipeline for generating sequencing reports for the SNP&Se
44
## Pre-requisites
55
You need to:
66
- install Nextflow (e.g. using conda `conda create -n nextflow-env nextflow` or downloading from [nextflow.io](https://www.nextflow.io/)).
7-
- install [Singularity (version > 2.6)](https://singularity.lbl.gov/install-linux#adding-the-mirror-and-installing).
7+
- install [Apptainer](https://apptainer.org/docs/admin/latest/installation.html).
88

99
Optional:
1010
- (currently mandatory: see known issues) Download the fastq-screen database by downloading fastq-screen from [here](https://www.bioinformatics.babraham.ac.uk/projects/fastq_screen/fastq_screen_v0.13.0.tar.gz), extract the archive and then run `fastq_screen --get_genomes`.
@@ -64,11 +64,9 @@ black .
6464
Assuming you have installed all pre-requisites (except the fastq screen database: test data comes with a minimal version of it), you can run tests locally by following these steps:
6565

6666
```
67-
# create virtual environment
68-
virtualenv -p python3.9 venv/
69-
70-
# activate venv
71-
source venv/bin/activate
67+
# create a virtual env with a tool of your choice, for example pyenv
68+
pyenv virtualenv 3.11 seqreports
69+
pyenv activate seqreports
7270
7371
# install dependencies
7472
pip install -r requirements-dev.txt

main.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ process GET_QC_THRESHOLDS {
234234
path runfolder
235235

236236
output:
237-
path "qc_thresholds.yaml" optional true
237+
path "qc_thresholds.yaml", optional: true
238238

239239
script:
240240
if ( params.checkqc_config ){

0 commit comments

Comments
 (0)