Skip to content

Commit bee153c

Browse files
committed
prettier
1 parent 29d8e1f commit bee153c

File tree

7 files changed

+130
-104
lines changed

7 files changed

+130
-104
lines changed

CHANGELOG.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66
## v1.4.0
77

88
### `Added`
9+
910
* DSL2 version of nf-core-hic pipeline
1011

1112
## v1.3.1 - 2021-09-25
@@ -75,21 +76,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7576
* cooler `0.8.5` > `0.8.6`
7677
* multiqc `1.7` > `1.8`
7778
* iced `0.5.1` > `0.5.6`
78-
* *_New_* pymdown-extensions `7.1`
79-
* *_New_* hicexplorer `3.4.3`
80-
* *_New_* bioconductor-hitc `1.32.0`
81-
* *_New_* r-optparse `1.6.6`
82-
* *_New_* ucsc-bedgraphtobigwig `377`
83-
* *_New_* cython `0.29.19`
84-
* *_New_* cooltools `0.3.2`
85-
* *_New_* fanc `0.8.30`
86-
* *_Removed_* r-markdown
79+
* _*New*_ pymdown-extensions `7.1`
80+
* _*New*_ hicexplorer `3.4.3`
81+
* _*New*_ bioconductor-hitc `1.32.0`
82+
* _*New*_ r-optparse `1.6.6`
83+
* _*New*_ ucsc-bedgraphtobigwig `377`
84+
* _*New*_ cython `0.29.19`
85+
* _*New*_ cooltools `0.3.2`
86+
* _*New*_ fanc `0.8.30`
87+
* _*Removed*_ r-markdown
8788

8889
### `Fixed`
8990

9091
* Fix error in doc for Arima kit usage
9192
* Sort output of `get_valid_interaction` process as the input files of `remove_duplicates`
92-
are expected to be sorted (sort -m)
93+
are expected to be sorted (sort -m)
9394

9495
### `Deprecated`
9596

@@ -138,7 +139,7 @@ DNase Hi-C, Micro-C, capture-C or HiChip data.
138139
In summary, this version allows :
139140

140141
* Automatic detection and generation of annotation files based on igenomes
141-
if not provided.
142+
if not provided.
142143
* Two-steps alignment of raw sequencing reads
143144
* Reads filtering and detection of valid interaction products
144145
* Generation of raw contact matrices for a set of resolutions

CITATIONS.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# nf-core/hic: Citations
22

3-
43
## [HiC-Pro](https://genomebiology.biomedcentral.com/articles/10.1186/s13059-015-0831-x)
54

65
> Servant N, Varoquaux N, Lajoie BR, Viara E, Chen C, Vert JP, Dekker J, Heard E, Barillot E. Genome Biology 2015, 16:259 doi: [10.1186/s13059-015-0831-x](https://dx.doi.org/10.1186/s13059-015-0831-x)
@@ -15,27 +14,26 @@
1514
1615
## Pipeline tools
1716

18-
- [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)
17+
* [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)
1918

20-
- [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
19+
* [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
2120
> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924.
2221
2322
## Software packaging/containerisation tools
2423

25-
- [Anaconda](https://anaconda.com)
24+
* [Anaconda](https://anaconda.com)
2625

2726
> Anaconda Software Distribution. Computer software. Vers. 2-2.4.0. Anaconda, Nov. 2016. Web.
2827
29-
- [Bioconda](https://pubmed.ncbi.nlm.nih.gov/29967506/)
28+
* [Bioconda](https://pubmed.ncbi.nlm.nih.gov/29967506/)
3029

3130
> Grüning B, Dale R, Sjödin A, Chapman BA, Rowe J, Tomkins-Tinch CH, Valieris R, Köster J; Bioconda Team. Bioconda: sustainable and comprehensive software distribution for the life sciences. Nat Methods. 2018 Jul;15(7):475-476. doi: 10.1038/s41592-018-0046-7. PubMed PMID: 29967506.
3231
33-
- [BioContainers](https://pubmed.ncbi.nlm.nih.gov/28379341/)
32+
* [BioContainers](https://pubmed.ncbi.nlm.nih.gov/28379341/)
3433

3534
> da Veiga Leprevost F, Grüning B, Aflitos SA, Röst HL, Uszkoreit J, Barsnes H, Vaudel M, Moreno P, Gatto L, Weber J, Bai M, Jimenez RC, Sachsenberg T, Pfeuffer J, Alvarez RV, Griss J, Nesvizhskii AI, Perez-Riverol Y. BioContainers: an open-source and community-driven framework for software standardization. Bioinformatics. 2017 Aug 15;33(16):2580-2582. doi: 10.1093/bioinformatics/btx192. PubMed PMID: 28379341; PubMed Central PMCID: PMC5870671.
3635
37-
- [Docker](https://dl.acm.org/doi/10.5555/2600239.2600241)
36+
* [Docker](https://dl.acm.org/doi/10.5555/2600239.2600241)
3837

39-
- [Singularity](https://pubmed.ncbi.nlm.nih.gov/28494014/)
38+
* [Singularity](https://pubmed.ncbi.nlm.nih.gov/28494014/)
4039
> Kurtzer GM, Sochat V, Bauer MW. Singularity: Scientific containers for mobility of compute. PLoS One. 2017 May 11;12(5):e0177459. doi: 10.1371/journal.pone.0177459. eCollection 2017. PubMed PMID: 28494014; PubMed Central PMCID: PMC5426675.
41-

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ On release, automated continuous integration tests run the pipeline on a full-si
2323

2424
## Pipeline summary
2525

26-
1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))
26+
1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))
2727
2. Hi-C data processing
2828
1. [`HiC-Pro`](https://github.com/nservant/HiC-Pro)
2929
1. Mapping using a two steps strategy to rescue reads spanning the ligation
30-
sites ([`bowtie2`](http://bowtie-bio.sourceforge.net/bowtie2/index.shtml))
30+
sites ([`bowtie2`](http://bowtie-bio.sourceforge.net/bowtie2/index.shtml))
3131
2. Detection of valid interaction products
3232
3. Duplicates removal
3333
4. Generate raw and normalized contact maps ([`iced`](https://github.com/hiclib/iced))
@@ -39,7 +39,6 @@ On release, automated continuous integration tests run the pipeline on a full-si
3939
8. TADs calling ([`HiCExplorer`](https://github.com/deeptools/HiCExplorer), [`cooltools`](https://cooltools.readthedocs.io/en/latest/))
4040
9. Quality control report ([`MultiQC`](https://multiqc.info/))
4141

42-
4342
## Quick Start
4443

4544
1. Install [`Nextflow`](https://www.nextflow.io/docs/latest/getstarted.html#installation) (`>=21.10.3`)
@@ -54,10 +53,10 @@ On release, automated continuous integration tests run the pipeline on a full-si
5453

5554
Note that some form of configuration will be needed so that Nextflow knows how to fetch the required software. This is usually done in the form of a config profile (`YOURPROFILE` in the example command above). You can chain multiple config profiles in a comma-separated string.
5655

57-
> - The pipeline comes with config profiles called `docker`, `singularity`, `podman`, `shifter`, `charliecloud` and `conda` which instruct the pipeline to use the named tool for software management. For example, `-profile test,docker`.
58-
> - Please check [nf-core/configs](https://github.com/nf-core/configs#documentation) to see if a custom config file to run nf-core pipelines already exists for your Institute. If so, you can simply use `-profile <institute>` in your command. This will enable either `docker` or `singularity` and set the appropriate execution settings for your local compute environment.
59-
> - If you are using `singularity`, please use the [`nf-core download`](https://nf-co.re/tools/#downloading-pipelines-for-offline-use) command to download images first, before running the pipeline. Setting the [`NXF_SINGULARITY_CACHEDIR` or `singularity.cacheDir`](https://www.nextflow.io/docs/latest/singularity.html?#singularity-docker-hub) Nextflow options enables you to store and re-use the images from a central location for future pipeline runs.
60-
> - If you are using `conda`, it is highly recommended to use the [`NXF_CONDA_CACHEDIR` or `conda.cacheDir`](https://www.nextflow.io/docs/latest/conda.html) settings to store the environments in a central location for future pipeline runs.
56+
> * The pipeline comes with config profiles called `docker`, `singularity`, `podman`, `shifter`, `charliecloud` and `conda` which instruct the pipeline to use the named tool for software management. For example, `-profile test,docker`.
57+
> * Please check [nf-core/configs](https://github.com/nf-core/configs#documentation) to see if a custom config file to run nf-core pipelines already exists for your Institute. If so, you can simply use `-profile <institute>` in your command. This will enable either `docker` or `singularity` and set the appropriate execution settings for your local compute environment.
58+
> * If you are using `singularity`, please use the [`nf-core download`](https://nf-co.re/tools/#downloading-pipelines-for-offline-use) command to download images first, before running the pipeline. Setting the [`NXF_SINGULARITY_CACHEDIR` or `singularity.cacheDir`](https://www.nextflow.io/docs/latest/singularity.html?#singularity-docker-hub) Nextflow options enables you to store and re-use the images from a central location for future pipeline runs.
59+
> * If you are using `conda`, it is highly recommended to use the [`NXF_CONDA_CACHEDIR` or `conda.cacheDir`](https://www.nextflow.io/docs/latest/conda.html) settings to store the environments in a central location for future pipeline runs.
6160
6261
4. Start running your own analysis!
6362

@@ -81,7 +80,7 @@ For further information or help, don't hesitate to get in touch on the [Slack `#
8180

8281
## Citations
8382

84-
If you use nf-core/hic for your analysis, please cite it using the following doi: doi: [10.5281/zenodo.2669513](https://doi.org/10.5281/zenodo.2669513)
83+
If you use nf-core/hic for your analysis, please cite it using the following doi: doi: [10.5281/zenodo.2669513](https://doi.org/10.5281/zenodo.2669513)
8584

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

docs/output.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes d
2020
* [Compartments calling](#compartments-calling)
2121
* [TADs calling](#tads-calling)
2222
* [MultiQC](#multiqc) - aggregate report and quality controls, describing
23-
results of the whole pipeline
23+
results of the whole pipeline
2424
* [Export](#exprot) - additionnal export for compatibility with downstream
25-
analysis tool and visualization
25+
analysis tool and visualization
2626

2727
## HiC-Pro
2828

@@ -79,14 +79,14 @@ reference genome and the digestion protocol.
7979
Invalid pairs are classified as follow:
8080

8181
* Dangling end, i.e. unligated fragments (both reads mapped on the same
82-
restriction fragment)
82+
restriction fragment)
8383
* Self circles, i.e. fragments ligated on themselves (both reads mapped on the
84-
same restriction fragment in inverted orientation)
84+
same restriction fragment in inverted orientation)
8585
* Religation, i.e. ligation of juxtaposed fragments
8686
* Filtered pairs, i.e. any pairs that do not match the filtering criteria on
87-
inserts size, restriction fragments size
87+
inserts size, restriction fragments size
8888
* Dumped pairs, i.e. any pairs for which we were not able to reconstruct the
89-
ligation product.
89+
ligation product.
9090

9191
Only valid pairs involving two different restriction fragments are used to
9292
build the contact maps.
@@ -249,10 +249,10 @@ Usually, TADs results are presented as simple BED files, or bigWig files, with t
249249
<details markdown="1">
250250
<summary>Output files</summary>
251251

252-
- `multiqc/`
253-
- `multiqc_report.html`: a standalone HTML file that can be viewed in your web browser.
254-
- `multiqc_data/`: directory containing parsed statistics from the different tools used in the pipeline.
255-
- `multiqc_plots/`: directory containing static images from the report in various formats.
252+
* `multiqc/`
253+
* `multiqc_report.html`: a standalone HTML file that can be viewed in your web browser.
254+
* `multiqc_data/`: directory containing parsed statistics from the different tools used in the pipeline.
255+
* `multiqc_plots/`: directory containing static images from the report in various formats.
256256

257257
</details>
258258

@@ -265,10 +265,10 @@ Results generated by MultiQC collate pipeline QC from supported tools e.g. FastQ
265265
<details markdown="1">
266266
<summary>Output files</summary>
267267

268-
- `pipeline_info/`
269-
- Reports generated by Nextflow: `execution_report.html`, `execution_timeline.html`, `execution_trace.txt` and `pipeline_dag.dot`/`pipeline_dag.svg`.
270-
- Reports generated by the pipeline: `pipeline_report.html`, `pipeline_report.txt` and `software_versions.yml`. The `pipeline_report*` files will only be present if the `--email` / `--email_on_fail` parameter's are used when running the pipeline.
271-
- Reformatted samplesheet files used as input to the pipeline: `samplesheet.valid.csv`.
268+
* `pipeline_info/`
269+
* Reports generated by Nextflow: `execution_report.html`, `execution_timeline.html`, `execution_trace.txt` and `pipeline_dag.dot`/`pipeline_dag.svg`.
270+
* Reports generated by the pipeline: `pipeline_report.html`, `pipeline_report.txt` and `software_versions.yml`. The `pipeline_report*` files will only be present if the `--email` / `--email_on_fail` parameter's are used when running the pipeline.
271+
* Reformatted samplesheet files used as input to the pipeline: `samplesheet.valid.csv`.
272272

273273
</details>
274274

docs/usage.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fails after three times then the pipeline is stopped.
102102
## Core Nextflow arguments
103103

104104
> **NB:** These options are part of Nextflow and use a _single_ hyphen
105-
(pipeline parameters use a double-hyphen).
105+
> (pipeline parameters use a double-hyphen).
106106
107107
### `-profile`
108108

@@ -112,7 +112,7 @@ configuration presets for different compute environments.
112112
Several generic profiles are bundled with the pipeline which instruct the pipeline to use software packaged using different methods (Docker, Singularity, Podman, Shifter, Charliecloud, Conda) - see below. When using Biocontainers, most of these software packaging methods pull Docker containers from quay.io e.g [FastQC](https://quay.io/repository/biocontainers/fastqc) except for Singularity which directly downloads Singularity images via https hosted by the [Galaxy project](https://depot.galaxyproject.org/singularity/) and Conda which downloads and installs software locally from [Bioconda](https://bioconda.github.io/).
113113

114114
> We highly recommend the use of Docker or Singularity containers for full
115-
pipeline reproducibility, however when this is not possible, Conda is also supported.
115+
> pipeline reproducibility, however when this is not possible, Conda is also supported.
116116
117117
The pipeline also dynamically loads configurations from
118118
[https://github.com/nf-core/configs](https://github.com/nf-core/configs)
@@ -131,21 +131,21 @@ If `-profile` is not specified, the pipeline will run locally and
131131
expect all software to be
132132
installed and available on the `PATH`. This is _not_ recommended.
133133

134-
- `docker`
135-
- A generic configuration profile to be used with [Docker](https://docker.com/)
136-
- `singularity`
137-
- A generic configuration profile to be used with [Singularity](https://sylabs.io/docs/)
138-
- `podman`
139-
- A generic configuration profile to be used with [Podman](https://podman.io/)
140-
- `shifter`
141-
- A generic configuration profile to be used with [Shifter](https://nersc.gitlab.io/development/shifter/how-to-use/)
142-
- `charliecloud`
143-
- A generic configuration profile to be used with [Charliecloud](https://hpc.github.io/charliecloud/)
144-
- `conda`
145-
- A generic configuration profile to be used with [Conda](https://conda.io/docs/). Please only use Conda as a last resort i.e. when it's not possible to run the pipeline with Docker, Singularity, Podman, Shifter or Charliecloud.
146-
- `test`
147-
- A profile with a complete configuration for automated testing
148-
- Includes links to test data so needs no other parameters
134+
* `docker`
135+
* A generic configuration profile to be used with [Docker](https://docker.com/)
136+
* `singularity`
137+
* A generic configuration profile to be used with [Singularity](https://sylabs.io/docs/)
138+
* `podman`
139+
* A generic configuration profile to be used with [Podman](https://podman.io/)
140+
* `shifter`
141+
* A generic configuration profile to be used with [Shifter](https://nersc.gitlab.io/development/shifter/how-to-use/)
142+
* `charliecloud`
143+
* A generic configuration profile to be used with [Charliecloud](https://hpc.github.io/charliecloud/)
144+
* `conda`
145+
* A generic configuration profile to be used with [Conda](https://conda.io/docs/). Please only use Conda as a last resort i.e. when it's not possible to run the pipeline with Docker, Singularity, Podman, Shifter or Charliecloud.
146+
* `test`
147+
* A profile with a complete configuration for automated testing
148+
* Includes links to test data so needs no other parameters
149149

150150
### `-resume`
151151

@@ -224,7 +224,7 @@ The [Nextflow DSL2](https://www.nextflow.io/docs/latest/dsl2.html) implementatio
224224
2. Find the latest version of the Biocontainer available on [Quay.io](https://quay.io/repository/biocontainers/pangolin?tag=latest&tab=tags)
225225
3. Create the custom config accordingly:
226226

227-
- For Docker:
227+
* For Docker:
228228

229229
```nextflow
230230
process {
@@ -234,7 +234,7 @@ The [Nextflow DSL2](https://www.nextflow.io/docs/latest/dsl2.html) implementatio
234234
}
235235
```
236236
237-
- For Singularity:
237+
* For Singularity:
238238
239239
```nextflow
240240
process {
@@ -244,7 +244,7 @@ The [Nextflow DSL2](https://www.nextflow.io/docs/latest/dsl2.html) implementatio
244244
}
245245
```
246246
247-
- For Conda:
247+
* For Conda:
248248
249249
```nextflow
250250
process {
@@ -330,7 +330,7 @@ Please note the following requirements:
330330
1. The path must be enclosed in quotes
331331
2. The path must have at least one `*` wildcard character
332332
3. When using the pipeline with paired end data, the path must use `{1,2}`
333-
notation to specify read pairs.
333+
notation to specify read pairs.
334334

335335
If left unspecified, a default pattern is used: `data/*{1,2}.fastq.gz`
336336

@@ -467,7 +467,7 @@ Minimum mapping quality. Reads with lower quality are discarded. Default: 10
467467

468468
This parameter allows to automatically set the `--restriction_site` and
469469
`--ligation_site` parameter according to the restriction enzyme you used.
470-
Available keywords are 'hindiii', 'dpnii', 'mboi', 'arima'.
470+
Available keywords are 'hindiii', 'dpnii', 'mboi', 'arima'.
471471

472472
```bash
473473
--digestion 'hindiii'

modules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
}
2424
}
2525
}
26-
}
26+
}

0 commit comments

Comments
 (0)