Skip to content

Commit

Permalink
Prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
nictru committed Jun 11, 2024
1 parent e7c2c13 commit 3981565
Show file tree
Hide file tree
Showing 18 changed files with 79 additions and 106 deletions.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@
Not all of the steps shown in the metromap have already been implemented, as this pipeline is still under development. However, the following steps are already functional:

1. Per-dataset preprocessing
1. Convert all RDS files to h5ad format
2. Present QC for raw counts ([`MultiQC`](http://multiqc.info/))
3. Apply user-defined QC filters
4. Remove ambient RNA
- [decontX](https://bioconductor.org/packages/release/bioc/html/decontX.html)
5. Doublet detection
- [SOLO](https://docs.scvi-tools.org/en/stable/user_guide/models/solo.html)
1. Convert all RDS files to h5ad format
2. Present QC for raw counts ([`MultiQC`](http://multiqc.info/))
3. Apply user-defined QC filters
4. Remove ambient RNA
- [decontX](https://bioconductor.org/packages/release/bioc/html/decontX.html)
5. Doublet detection
- [SOLO](https://docs.scvi-tools.org/en/stable/user_guide/models/solo.html)
2. Dataset aggregation
1. Merge into a single h5ad file
2. Present QC for merged counts ([`MultiQC`](http://multiqc.info/))
3. Integration
- [scVI](https://docs.scvi-tools.org/en/stable/user_guide/models/scvi.html)
- [scANVI](https://docs.scvi-tools.org/en/stable/user_guide/models/scanvi.html)
1. Merge into a single h5ad file
2. Present QC for merged counts ([`MultiQC`](http://multiqc.info/))
3. Integration
- [scVI](https://docs.scvi-tools.org/en/stable/user_guide/models/scvi.html)
- [scANVI](https://docs.scvi-tools.org/en/stable/user_guide/models/scanvi.html)
3. Clustering and dimensionality reduction
1. [Leiden clustering](https://scanpy.readthedocs.io/en/stable/generated/scanpy.tl.leiden.html)
2. [UMAP](https://scanpy.readthedocs.io/en/stable/generated/scanpy.tl.umap.html)
1. [Leiden clustering](https://scanpy.readthedocs.io/en/stable/generated/scanpy.tl.leiden.html)
2. [UMAP](https://scanpy.readthedocs.io/en/stable/generated/scanpy.tl.umap.html)

## Usage

Expand Down
9 changes: 2 additions & 7 deletions assets/schema_input.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
"type": "string",
"pattern": "^\\S+$",
"errorMessage": "Dataset name must be provided and cannot contain spaces",
"meta": [
"id"
]
"meta": ["id"]
},
"file": {
"type": "string",
Expand Down Expand Up @@ -43,9 +41,6 @@
"meta": ["unknown_label"]
}
},
"required": [
"dataset",
"file"
]
"required": ["dataset", "file"]
}
}
18 changes: 5 additions & 13 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
"multiqc": {
"branch": "master",
"git_sha": "b7ebe95761cd389603f9cc0e0dc384c0f663815a",
"installed_by": [
"modules"
]
"installed_by": ["modules"]
}
}
},
Expand All @@ -19,26 +17,20 @@
"utils_nextflow_pipeline": {
"branch": "master",
"git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
"installed_by": [
"subworkflows"
]
"installed_by": ["subworkflows"]
},
"utils_nfcore_pipeline": {
"branch": "master",
"git_sha": "92de218a329bfc9a9033116eb5f65fd270e72ba3",
"installed_by": [
"subworkflows"
]
"installed_by": ["subworkflows"]
},
"utils_nfvalidation_plugin": {
"branch": "master",
"git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
"installed_by": [
"subworkflows"
]
"installed_by": ["subworkflows"]
}
}
}
}
}
}
}
6 changes: 3 additions & 3 deletions modules/local/adata/extend/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: adata_extend
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::anndata=0.10.7
- conda-forge::anndata=0.10.7
6 changes: 3 additions & 3 deletions modules/local/adata/merge/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: adata_merge
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::scanpy=1.10.1
- conda-forge::scanpy=1.10.1
12 changes: 6 additions & 6 deletions modules/local/adata/readrds/environment.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: adata_readrds
name: adata_readrds
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- bioconda::anndata2ri=1.3.1
- conda-forge::anndata=0.10.7
- conda-forge::r-seurat=5.0.3
- bioconda::anndata2ri=1.3.1
- conda-forge::anndata=0.10.7
- conda-forge::r-seurat=5.0.3
12 changes: 6 additions & 6 deletions modules/local/adata/tords/environment.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: adata_tords
name: adata_tords
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- bioconda::anndata2ri=1.3.1
- conda-forge::anndata=0.10.7
- conda-forge::r-seurat=5.0.3
- bioconda::anndata2ri=1.3.1
- conda-forge::anndata=0.10.7
- conda-forge::r-seurat=5.0.3
6 changes: 3 additions & 3 deletions modules/local/adata/unify/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: adata_unify
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::anndata=0.10.7
- conda-forge::anndata=0.10.7
8 changes: 4 additions & 4 deletions modules/local/adata/upsetgenes/environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: adata_upsetgenes
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::scanpy=1.10.1
- conda-forge::upsetplot=0.9.0
- conda-forge::scanpy=1.10.1
- conda-forge::upsetplot=0.9.0
10 changes: 5 additions & 5 deletions modules/local/celda/decontx/environment.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: celda_decontx
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- bioconda::anndata2ri=1.3.1
- bioconda::bioconductor-celda=1.18.1
- conda-forge::anndata=0.10.7
- bioconda::anndata2ri=1.3.1
- bioconda::bioconductor-celda=1.18.1
- conda-forge::anndata=0.10.7
10 changes: 5 additions & 5 deletions modules/local/scanpy/leiden/environment.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: scanpy_leiden
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::leidenalg=0.10.2
- conda-forge::python-igraph=0.11.4
- conda-forge::scanpy=1.10.1
- conda-forge::leidenalg=0.10.2
- conda-forge::python-igraph=0.11.4
- conda-forge::scanpy=1.10.1
8 changes: 4 additions & 4 deletions modules/local/scanpy/neighbors/environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: scanpy_neighbors
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::python-igraph=0.11.4
- conda-forge::scanpy=1.10.1
- conda-forge::python-igraph=0.11.4
- conda-forge::scanpy=1.10.1
6 changes: 3 additions & 3 deletions modules/local/scanpy/plotqc/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: scanpy_plotqc
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::scanpy=1.10.1
- conda-forge::scanpy=1.10.1
6 changes: 3 additions & 3 deletions modules/local/scanpy/umap/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: scanpy_umap
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::scanpy=1.10.1
- conda-forge::scanpy=1.10.1
6 changes: 3 additions & 3 deletions modules/local/scvitools/scanvi/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: scvitools_scanvi
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::scvi-tools=1.1.2
- conda-forge::scvi-tools=1.1.2
6 changes: 3 additions & 3 deletions modules/local/scvitools/scvi/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: scvitools_scvi
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::scvi-tools=1.1.2
- conda-forge::scvi-tools=1.1.2
6 changes: 3 additions & 3 deletions modules/local/scvitools/solo/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: scvitools_solo
channels:
- conda-forge
- bioconda
- conda-forge
- bioconda
dependencies:
- conda-forge::scvi-tools=1.1.2
- conda-forge::scvi-tools=1.1.2
22 changes: 4 additions & 18 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
"type": "object",
"fa_icon": "fas fa-terminal",
"description": "Define where the pipeline should find input data and save output data.",
"required": [
"input",
"outdir"
],
"required": ["input", "outdir"],
"properties": {
"input": {
"type": "string",
Expand Down Expand Up @@ -54,17 +51,13 @@
"ambient_removal": {
"type": "string",
"default": "decontx",
"enum": [
"decontx"
],
"enum": ["decontx"],
"description": "Specify the tool to use for ambient RNA removal"
},
"doublet_detection": {
"type": "string",
"default": "solo",
"enum": [
"solo"
],
"enum": ["solo"],
"description": "Specify the tool to use for doublet detection"
},
"integration_methods": {
Expand Down Expand Up @@ -191,14 +184,7 @@
"description": "Method used to save pipeline results to output directory.",
"help_text": "The Nextflow `publishDir` option specifies which intermediate files should be saved to the output directory. This option tells the pipeline what method should be used to move these files. See [Nextflow docs](https://www.nextflow.io/docs/latest/process.html#publishdir) for details.",
"fa_icon": "fas fa-copy",
"enum": [
"symlink",
"rellink",
"link",
"copy",
"copyNoFollow",
"move"
],
"enum": ["symlink", "rellink", "link", "copy", "copyNoFollow", "move"],
"hidden": true
},
"email_on_fail": {
Expand Down

0 comments on commit 3981565

Please sign in to comment.