Skip to content

Commit 62aa1c6

Browse files
committed
removed gunzip, changes to ci test pipeline, ci changed to stub runs
1 parent 4cdb980 commit 62aa1c6

File tree

19 files changed

+50
-443
lines changed

19 files changed

+50
-443
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,12 @@ jobs:
8282
- name: Clean up Disk space
8383
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
8484

85-
- name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
85+
- name: "Run pipeline image mode with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
8686
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
8787
run: |
88-
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results
88+
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results --mode image -stub
89+
90+
- name: "Run pipeline coordinate mode with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
91+
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
92+
run: |
93+
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results --mode coordinate -stub

conf/modules.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ process {
2727
]
2828
}
2929

30-
withName: GUNZIP {
31-
ext.prefix = "transcripts.csv"
32-
}
33-
3430
withName: XENIUMRANGER_RESEGMENT {
3531
publishDir = [
3632
path: "${params.outdir}/xeniumranger/resegment",

modules.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
"installed_by": ["modules"],
1212
"patch": "modules/nf-core/cellpose/cellpose.diff"
1313
},
14-
"gunzip": {
15-
"branch": "master",
16-
"git_sha": "81880787133db07d9b4c1febd152c090eb8325dc",
17-
"installed_by": ["modules"],
18-
"patch": "modules/nf-core/gunzip/gunzip.diff"
19-
},
2014
"multiqc": {
2115
"branch": "master",
2216
"git_sha": "7b50cb7be890e4b28cffb82e438cc6a8d7805d3f",
@@ -25,7 +19,8 @@
2519
"untar": {
2620
"branch": "master",
2721
"git_sha": "05954dab2ff481bcb999f24455da29a5828af08d",
28-
"installed_by": ["modules"]
22+
"installed_by": ["modules"],
23+
"patch": "modules/nf-core/untar/untar.diff"
2924
},
3025
"unzip": {
3126
"branch": "master",

modules/local/spatialconverter/parquet_to_csv/main.nf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ process PARQUET_TO_CSV {
66

77
input:
88
tuple val(meta), path(transcripts)
9+
val(extension)
910

1011
output:
11-
tuple val(meta), path("*.csv"), emit: transcripts_csv
12-
path("versions.yml") , emit: versions
12+
tuple val(meta), path("*.csv*"), emit: transcripts_csv
13+
path("versions.yml") , emit: versions
1314

1415
when:
1516
task.ext.when == null || task.ext.when
@@ -23,7 +24,7 @@ process PARQUET_TO_CSV {
2324

2425
stub:
2526
"""
26-
touch ${transcripts}
27+
touch ${transcripts}.csv
2728
cat <<-END_VERSIONS > versions.yml
2829
"${task.process}":
2930
spatialconverter: "${task.version}"

modules/local/spatialconverter/parquet_to_csv/templates/parquet_to_csv.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@
44

55
if __name__ == '__main__':
66
print("[START]")
7+
8+
ext = "${extension}" if "${extension}" else ".csv"
79
df = pd.read_parquet("${transcripts}")
8-
output="${transcripts}".replace(".parquet",".csv")
9-
df.to_csv(f"{output}", index=False)
10+
11+
if ext == ".csv":
12+
output="${transcripts}".replace(".parquet",".csv")
13+
df.to_csv(f"{output}", index=False)
14+
15+
if ext == ".gz":
16+
output="${transcripts}".replace(".parquet",".csv.gz")
17+
df.to_csv(f"{output}", compression='gzip', index=False)
1018

1119
#Output version information
1220
with open("versions.yml", "w") as f:

modules/nf-core/gunzip/environment.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

modules/nf-core/gunzip/gunzip.diff

Lines changed: 0 additions & 41 deletions
This file was deleted.

modules/nf-core/gunzip/main.nf

Lines changed: 0 additions & 53 deletions
This file was deleted.

modules/nf-core/gunzip/meta.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

modules/nf-core/gunzip/tests/main.nf.test

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)