Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:

- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
# TODO nf-core: You can customise AWS full pipeline tests as required
# Add full size test data (but still relatively small datasets for few samples)
# on the `test_full.config` test runs with only one set of parameters
with:
Expand Down
4 changes: 3 additions & 1 deletion .nf-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ lint:
nf_core_version: 3.5.2
repository_type: pipeline
template:
author: Sameesh Kher, Florian Heyl
author: Sameesh Kher, Dongze He, Florian Heyl
description: A pipeline for spatialomics Xenium In Situ data.
force: false
is_nfcore: true
name: spatialxe
org: nf-core
outdir: .
skip_features:
- igenomes
version: 1.0.0
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,8 @@ For further information or help, don't hesitate to get in touch on the [Slack `#

## Citations

<!-- TODO nf-core: Add citation for pipeline after first release. Uncomment lines below and update Zenodo doi and badge at the top of this file. -->
<!-- If you use nf-core/spatialxe for your analysis, please cite it using the following doi: [10.5281/zenodo.XXXXXX](https://doi.org/10.5281/zenodo.XXXXXX) -->

<!-- TODO nf-core: Add bibliography of tools and data used in your pipeline -->

An extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.

You can cite the `nf-core` publication as follows:
Expand Down
1 change: 0 additions & 1 deletion assets/methods_description_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ description: "Suggested text and references to use when describing pipeline usag
section_name: "nf-core/spatialxe Methods Description"
section_href: "https://github.com/nf-core/spatialxe"
plot_type: "html"
## nf-core: Update the HTML below to your preferred methods description, e.g. add publication citation for this pipeline
## You inject any metadata in the Nextflow '${workflow}' object
data: |
<h4>Methods</h4>
Expand Down
4 changes: 2 additions & 2 deletions conf/base.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ process {
memory = { 6.GB * task.attempt }
time = { 4.h * task.attempt }

resourceLimits = [ cpus: 192, memory: 750.GB, time: 72.h ]
// resourceLimits = [ cpus: 192, memory: 750.GB, time: 72.h ]

errorStrategy = { task.exitStatus in ((130..145) + 104 + 2147483647) ? 'retry' : 'finish' }
maxRetries = 3
Expand Down Expand Up @@ -79,7 +79,7 @@ process {
withLabel:process_gpu {
ext.use_gpu = { params.use_gpu }
accelerator = { params.use_gpu ? 1 : null }
containerOptions = { "--shm-size ${task.memory.toGiga().intValue()}g" }
// containerOptions = { "--shm-size ${task.memory.toGiga().intValue()}g" }
}

// Single-GPU processes (e.g., Cellpose, StarDist)
Expand Down
2 changes: 1 addition & 1 deletion conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ process {

withName: PARQUET_TO_CSV {
publishDir = [
path: { "${params.outdir}/${params.mode}/utility/spatialconverter/parquet_to_csv" },
path: { "${params.outdir}/${params.mode}/utility/parquet_to_csv" },
mode: params.publish_dir_mode,
]
}
Expand Down
2 changes: 1 addition & 1 deletion conf/test_coordinate_mode.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ process {
}

params {
config_profile_name = 'Test profile'
config_profile_name = 'Test profile coordinate mode'
config_profile_description = 'Minimal test dataset to check pipeline function in the coordinate mode'

// Input data
Expand Down
2 changes: 1 addition & 1 deletion conf/test_image_mode.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ process {
}

params {
config_profile_name = 'Test profile'
config_profile_name = 'Test profile image mode'
config_profile_description = 'Minimal test dataset to check pipeline function in the image mode'

// Input data
Expand Down
2 changes: 1 addition & 1 deletion conf/test_preview_mode.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ process {
}

params {
config_profile_name = 'Test profile'
config_profile_name = 'Test profile preview mode'
config_profile_description = 'Minimal test dataset to check pipeline function in the preview mode'

// Input data
Expand Down
2 changes: 1 addition & 1 deletion conf/test_segfree_mode.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ process {
}

params {
config_profile_name = 'Test profile'
config_profile_name = 'Test profile segfree mode'
config_profile_description = 'Minimal test dataset to check pipeline function in the segfree mode'

// Input data
Expand Down
4 changes: 2 additions & 2 deletions modules/local/baysor/create_dataset/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file(params.modules_testdata_base_path + "spatial_omics/xenium/homo_sapiens/spatial_gene_expression.csv", checkIfExists: true)
])
Expand All @@ -41,7 +41,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file(params.modules_testdata_base_path + "spatial_omics/xenium/homo_sapiens/spatial_gene_expression.csv", checkIfExists: true)
])
Expand Down
4 changes: 2 additions & 2 deletions modules/local/baysor/preprocess/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/transcripts.parquet", checkIfExists: true)
])
Expand Down Expand Up @@ -45,7 +45,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/transcripts.parquet", checkIfExists: true)
])
Expand Down
4 changes: 2 additions & 2 deletions modules/local/baysor/preview/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/transcripts.parquet", checkIfExists: true),
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/config/xenium.toml", checkIfExists: true)
Expand All @@ -41,7 +41,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/transcripts.parquet", checkIfExists: true),
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/config/xenium.toml", checkIfExists: true)
Expand Down
4 changes: 2 additions & 2 deletions modules/local/baysor/run/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/transcripts.parquet", checkIfExists: true),
[],
Expand Down Expand Up @@ -46,7 +46,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/transcripts.parquet", checkIfExists: true),
[],
Expand Down
4 changes: 2 additions & 2 deletions modules/local/baysor/segfree/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/transcripts.parquet", checkIfExists: true),
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/config/xenium.toml", checkIfExists: true)
Expand All @@ -41,7 +41,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_baysor"],
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/transcripts.parquet", checkIfExists: true),
file("https://raw.githubusercontent.com/khersameesh24/test-datasets/baysor/config/xenium.toml", checkIfExists: true)
Expand Down
6 changes: 2 additions & 4 deletions modules/local/ficture/model/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ process FICTURE {

script:
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"
def features_list = features ? "--in-feature ${features}": ""

"""
Expand All @@ -33,12 +32,11 @@ process FICTURE {
--n-factor 6,12 \\
--n-jobs ${task.cpus} \\
--plot-each-factor \\
--all
--all \\
${args}
"""

stub:
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"
"""
mkdir -p results/
"""
Expand Down
3 changes: 2 additions & 1 deletion modules/local/ficture/preprocess/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ process FICTURE_PREPROCESS {
ficture_preprocess.py \\
--transcripts ${transcripts} \\
${features_arg} \\
--negative-control-regex '${params.negative_control_regex}'
--negative-control-regex '${params.negative_control_regex}' \\
${args}
"""

stub:
Expand Down
4 changes: 2 additions & 2 deletions modules/local/proseg/proseg2baysor/tests/main.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_proseg2baysor"],
]).combine(PROSEG.out.seg_outs, by: 0)
"""
Expand All @@ -53,7 +53,7 @@ nextflow_process {
when {
process {
"""
input[0] = Channel.of([
input[0] = channel.of([
[id: "test_run_proseg2baysor"],
]).combine(PROSEG.out.seg_outs, by: 0)
"""
Expand Down
2 changes: 0 additions & 2 deletions modules/local/resolift/tests/tags.yml

This file was deleted.

1 change: 0 additions & 1 deletion modules/local/utility/convert_mask_uint32/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ process CONVERT_MASK_UINT32 {
tag "${meta.id}"
label 'process_low'

conda "conda-forge::python=3.12 conda-forge::tifffile conda-forge::numpy"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/d9/d964e0bef867bb2ff1a309c9c087d8d83ac734ce3aa315dd8311d4c1bfdafd8e/data' :
'community.wave.seqera.io/library/python_pip_imagecodecs_nvidia-cublas-cu12_pruned:b668bcb6d531d350' }"
Expand Down
1 change: 0 additions & 1 deletion modules/local/utility/extract_dapi/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ process EXTRACT_DAPI {
tag "${meta.id}"
label 'process_low'

conda "conda-forge::python=3.12 conda-forge::tifffile conda-forge::numpy"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/d9/d964e0bef867bb2ff1a309c9c087d8d83ac734ce3aa315dd8311d4c1bfdafd8e/data' :
'community.wave.seqera.io/library/python_pip_imagecodecs_nvidia-cublas-cu12_pruned:b668bcb6d531d350' }"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "spatialconverter_parquet_to_csv"
name: "parquet_to_csv"
description: Tool suite for spatial omics data conversions.
keywords:
- xenium
tools:
- "spatialconverter":
- "parquet_to_csv":
description: "Collects functions to convert data formats for various types of data processing and analysis for spatial omics data."
homepage: "https://github.com/heylf/spatialconverter"
documentation: "https://github.com/heylf/spatialconverter"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions modules/nf-core/xeniumranger/relabel/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions modules/nf-core/xeniumranger/resegment/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ params {
restrict_concurrency = false // restrict running certain process in parallel

// Boilerplate options
outdir = null
publish_dir_mode = 'copy'
email = null
email_on_fail = null
Expand Down
Loading
Loading