Skip to content

Commit 472ef27

Browse files
committed
finalise nextflow version
1 parent 8b7bb81 commit 472ef27

4 files changed

Lines changed: 5 additions & 22 deletions

File tree

.github/workflows/smoke_test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
nextflow_version: ["25.04.0", "latest-stable"]
15+
nextflow_version: ["26.04.0", "latest-stable"]
1616
profile:
1717
- test_sc_fastq
1818
- test_sc_bam
@@ -39,7 +39,6 @@ jobs:
3939
version: ${{ matrix.nextflow_version }}
4040
- name: Run ${{ matrix.profile }}
4141
run: |
42-
export NXF_SYNTAX_PARSER=v2
4342
nextflow run . -profile test_base,${{ matrix.profile }},docker \
4443
${{ matrix.quantification_mode && format('--quantification_mode {0}', matrix.quantification_mode) || '' }} \
4544
${{ matrix.bam_only && '--bam_only' || '' }}

README.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This pipeline performs context-aware transcript discovery and quantification fro
3434

3535
### **Installation**
3636
Install the following dependencies before running the pipeline:
37-
- [Nextflow](https://www.nextflow.io/docs/latest/install.html)25.04.0
37+
- [Nextflow](https://www.nextflow.io/docs/latest/install.html)26.04.0
3838
- [Docker](https://docs.docker.com/engine/install/ubuntu/) (or [Singularity](https://docs.sylabs.io/guides/3.0/user-guide/installation.html) if you do not have user permissions for Docker).
3939

4040
### **General Usage**
@@ -44,9 +44,6 @@ To run the pipeline, you must provide a samplesheet, reference genome, and refer
4444

4545
Use the command below to run the pipeline on the test data provided in `examples/`
4646
```
47-
# Required for Nextflow < 26.04
48-
export NXF_SYNTAX_PARSER=v2
49-
5047
nextflow run main.nf \
5148
--input examples/samplesheet_test_sc_fastq.csv \
5249
--genome examples/GRCh38.primary_assembly.genome.chr21.fa.gz \
@@ -247,9 +244,6 @@ Example data and pre-configured profiles are provided in `examples/` to run the
247244
| `test_custom` | Custom chemistry, single-sample ONT run from demultiplexed BAM |
248245

249246
```bash
250-
# Required for Nextflow < 26.04
251-
export NXF_SYNTAX_PARSER=v2
252-
253247
# Single-cell: test from FASTQ input
254248
nextflow run . -profile test_base,test_sc_fastq,singularity
255249

@@ -286,9 +280,6 @@ custom_example,examples/custom_example.bam,my_custom_chemistry,ONT
286280
The `--bam_only` flag stops the pipeline after genome alignment, saving BAM files to `output/bam/`. This is useful when you want to inspect the aligned reads or run downstream steps separately.
287281

288282
```bash
289-
# Required for Nextflow < 26.04
290-
export NXF_SYNTAX_PARSER=v2
291-
292283
nextflow run main.nf \
293284
--input examples/samplesheet_test_sc_fastq.csv \
294285
--genome examples/GRCh38.primary_assembly.genome.chr21.fa.gz \
@@ -307,9 +298,6 @@ sample,path,chemistry,technology
307298
```
308299

309300
```bash
310-
# Required for Nextflow < 26.04
311-
export NXF_SYNTAX_PARSER=v2
312-
313301
nextflow run main.nf \
314302
--input examples/samplesheet_test_sc_bam.csv \
315303
--genome examples/GRCh38.primary_assembly.genome.chr21.fa.gz \

main.nf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#! /usr/bin/env nextflow
22

3-
nextflow.enable.dsl=2
4-
53
include { DECOMPRESS as DECOMPRESS_GENOME } from './modules/decompress.nf'
64
include { DECOMPRESS as DECOMPRESS_ANNOTATION } from './modules/decompress.nf'
75
include { PREPARE_INPUT_STANDARD } from './subworkflows/prepare_input_standard.nf'
@@ -37,8 +35,8 @@ workflow {
3735
ch_genome = channel.value(file(params.genome, checkIfExists: true))
3836
ch_annotation = channel.value(file(params.annotation, checkIfExists: true))
3937

40-
ch_genome = params.genome.endsWith('.gz') ? DECOMPRESS_GENOME(ch_genome).file : ch_genome
41-
ch_annotation = params.annotation.endsWith('.gz') ? DECOMPRESS_ANNOTATION(ch_annotation).file : ch_annotation
38+
ch_genome = params.genome.toString().endsWith('.gz') ? DECOMPRESS_GENOME(ch_genome).file : ch_genome
39+
ch_annotation = params.annotation.toString().endsWith('.gz') ? DECOMPRESS_ANNOTATION(ch_annotation).file : ch_annotation
4240

4341
// load config files
4442
ch_barcode_coordinate_config = file("${projectDir}/assets/10x_config/barcode_coordinate_config.csv", checkIfExists: true)
@@ -47,15 +45,13 @@ workflow {
4745

4846
// parsing samplesheet csv file
4947
ch_input = channel.fromPath(params.input, checkIfExists: true)
50-
.ifEmpty { error "Cannot find samplesheet file: ${params.input}" }
5148
.map { file ->
5249
if (file.extension != "csv") {
5350
error "Invalid samplesheet. Must be a CSV file."
5451
}
5552
return file
5653
}
5754

58-
// TODO: Add Visium-HD and non-standard routing
5955
ch_standard = ch_input.splitCsv(header:true, sep:',')
6056
ch_n_samples = ch_standard.count()
6157

nextflow.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ manifest {
44
author = 'Andre Sim, Chin Hao Lee, Min Hao Ling'
55
version = 'v0.9-beta'
66
mainScript = 'main.nf'
7-
nextflowVersion = '>=25.04.0'
7+
nextflowVersion = '>=26.04.0'
88
}
99

1010
params {

0 commit comments

Comments
 (0)