Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev > main: first release #1

Merged
merged 35 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
64643d5
update modules
matthdsm Mar 8, 2024
70cd48f
intermediary commit
matthdsm Mar 8, 2024
1438d79
fix linting
matthdsm Mar 8, 2024
99b9b37
almost done
matthdsm Mar 8, 2024
085289a
finished workflow
matthdsm Mar 8, 2024
93ac951
linting + prettier
matthdsm Mar 8, 2024
c88ce5d
finish adding support for bam idex
matthdsm Mar 11, 2024
7a2c77c
add RG to bwa
matthdsm Mar 11, 2024
580d4f7
add haplotype maps
matthdsm Mar 11, 2024
441416f
Update nextflow_schema.json
matthdsm Mar 11, 2024
5c05814
Update assets/schema_input.json
matthdsm Mar 11, 2024
eaebd87
add torque config
matthdsm Mar 11, 2024
1598a1c
update test samplesheet
matthdsm Mar 11, 2024
93378b1
add samplesheet generation script
matthdsm Mar 12, 2024
492bed4
add a test
matthdsm Mar 12, 2024
8f8ae34
script bugfix
matthdsm Mar 12, 2024
8815991
remove print statement
matthdsm Mar 12, 2024
450bc6a
add support for multiple input dirs
matthdsm Mar 12, 2024
08885c6
output snp reads as cram
matthdsm Mar 13, 2024
556b0f2
add fai input
matthdsm Mar 19, 2024
8cc16dd
update config
matthdsm Mar 19, 2024
e5edcdc
patch crosscheckfingerprints
matthdsm Mar 20, 2024
1d3e0cf
update test data urls
matthdsm Mar 20, 2024
9a15158
bugfixes
matthdsm Mar 20, 2024
f6eeb6d
workaround for MQC bug
matthdsm Mar 20, 2024
4549e5a
more workaround
matthdsm Mar 20, 2024
5552ce7
add nf-test
matthdsm Mar 20, 2024
d19c52d
try to fix CI
matthdsm Mar 21, 2024
82b33b1
update modules
matthdsm Mar 21, 2024
1309913
prettier
matthdsm Mar 21, 2024
2509bcd
add utils dir to editorconfig ignore
matthdsm Mar 21, 2024
9c8a17e
fix linting ci
matthdsm Mar 21, 2024
7ae4401
fix nf-core linting
matthdsm Mar 21, 2024
ead4b12
fix csv formatting
matthdsm Mar 21, 2024
bbea163
fix tests
matthdsm Mar 21, 2024
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
100 changes: 50 additions & 50 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,53 @@ name: Bug report
description: Report something that is broken or incorrect
labels: bug
body:
- type: textarea
id: description
attributes:
label: Description of the bug
description: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: command_used
attributes:
label: Command used and terminal output
description: Steps to reproduce the behaviour. Please paste the command you used
to launch the pipeline and the output from your terminal.
render: console
placeholder: '$ nextflow run ...


Some output where something broke

'
- type: textarea
id: files
attributes:
label: Relevant files
description: 'Please drag and drop the relevant files here. Create a `.zip` archive
if the extension is not allowed.

Your verbose log file `.nextflow.log` is often useful _(this is a hidden file
in the directory where you launched the pipeline)_ as well as custom Nextflow
configuration files.

'
- type: textarea
id: system
attributes:
label: System information
description: '* Nextflow version _(eg. 23.04.0)_

* Hardware _(eg. HPC, Desktop, Cloud)_

* Executor _(eg. slurm, local, awsbatch)_

* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud,
or Apptainer)_

* OS _(eg. CentOS Linux, macOS, Linux Mint)_

* Version of nf-cmgg/sampletracking _(eg. 1.1, 1.5, 1.8.2)_

'
- type: textarea
id: description
attributes:
label: Description of the bug
description: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: command_used
attributes:
label: Command used and terminal output
description: Steps to reproduce the behaviour. Please paste the command you used
to launch the pipeline and the output from your terminal.
render: console
placeholder: "$ nextflow run ...


Some output where something broke

"
- type: textarea
id: files
attributes:
label: Relevant files
description: "Please drag and drop the relevant files here. Create a `.zip` archive
if the extension is not allowed.

Your verbose log file `.nextflow.log` is often useful _(this is a hidden file
in the directory where you launched the pipeline)_ as well as custom Nextflow
configuration files.

"
- type: textarea
id: system
attributes:
label: System information
description: "* Nextflow version _(eg. 23.04.0)_

* Hardware _(eg. HPC, Desktop, Cloud)_

* Executor _(eg. slurm, local, awsbatch)_

* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud,
or Apptainer)_

* OS _(eg. CentOS Linux, macOS, Linux Mint)_

* Version of nf-cmgg/sampletracking _(eg. 1.1, 1.5, 1.8.2)_

"
32 changes: 16 additions & 16 deletions .nf-core.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
lint:
files_exist:
- CODE_OF_CONDUCT.md
- assets/nf-core-sampletracking_logo_light.png
- docs/images/nf-core-sampletracking_logo_light.png
- docs/images/nf-core-sampletracking_logo_dark.png
- .github/ISSUE_TEMPLATE/config.yml
- .github/workflows/awstest.yml
- .github/workflows/awsfulltest.yml
- CODE_OF_CONDUCT.md
- assets/nf-core-sampletracking_logo_light.png
- docs/images/nf-core-sampletracking_logo_light.png
- docs/images/nf-core-sampletracking_logo_dark.png
- .github/ISSUE_TEMPLATE/config.yml
- .github/workflows/awstest.yml
- .github/workflows/awsfulltest.yml
files_unchanged:
- CODE_OF_CONDUCT.md
- assets/nf-core-sampletracking_logo_light.png
- docs/images/nf-core-sampletracking_logo_light.png
- docs/images/nf-core-sampletracking_logo_dark.png
- .github/ISSUE_TEMPLATE/bug_report.yml
- CODE_OF_CONDUCT.md
- assets/nf-core-sampletracking_logo_light.png
- docs/images/nf-core-sampletracking_logo_light.png
- docs/images/nf-core-sampletracking_logo_dark.png
multiqc_config:
- report_comment
- report_comment
nextflow_config:
- manifest.name
- manifest.homePage
- manifest.name
- manifest.homePage
repository_type: pipeline
template:
prefix: nf-cmgg
skip: []
skip:
- igenomes
2 changes: 1 addition & 1 deletion assets/multiqc_config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
report_comment: >
This report has been generated by the <a href="https://github.com/nf-cmgg/sampletracking/tree/dev" target="_blank">nf-cmgg/sampletracking</a>
This report has been generated by the <a href="https://github.com/nf-cmgg/sampletracking/releases/tag/1.0" target="_blank">nf-cmgg/sampletracking</a>
analysis pipeline.
report_section_order:
"nf-cmgg-sampletracking-methods-description":
Expand Down
6 changes: 3 additions & 3 deletions assets/samplesheet.csv
matthdsm marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
sample,fastq_1,fastq_2
SAMPLE_PAIRED_END,/path/to/fastq/files/AEG588A1_S1_L002_R1_001.fastq.gz,/path/to/fastq/files/AEG588A1_S1_L002_R2_001.fastq.gz
SAMPLE_SINGLE_END,/path/to/fastq/files/AEG588A4_S4_L003_R1_001.fastq.gz,
sample ,pool ,sample_bam ,sample_bam_index ,snp_fastq_1 ,snp_fastq_2 ,snp_bam ,snp_bam_index
sample1 ,pool1 ,https://github.com/nf-core/test-datasets/blob/modules/data/genomics/homo_sapiens/illumina/bam/test.paired_end.sorted.bam , , , ,https://github.com/nf-core/test-datasets/blob/modules/data/genomics/homo_sapiens/illumina/bam/test.paired_end.markduplicates.sorted.bam
sample2 ,pool1 ,https://github.com/nf-core/test-datasets/raw/modules/data/genomics/homo_sapiens/illumina/bam/test2.paired_end.sorted.bam , ,https://github.com/nf-core/test-datasets/raw/modules/data/genomics/homo_sapiens/illumina/fastq/test2_1.fastq.gz ,https://github.com/nf-core/test-datasets/raw/modules/data/genomics/homo_sapiens/illumina/fastq/test2_2.fastq.gz , ,
47 changes: 43 additions & 4 deletions assets/schema_input.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,62 @@
"type": "string",
"pattern": "^\\S+$",
"errorMessage": "Sample name must be provided and cannot contain spaces",
"meta": ["id"]
"meta": ["id", "samplename"],
"unique": true
},
"fastq_1": {
"pool": {
"type": "string",
"pattern": "^\\S+$",
"default": "sampletracking_pool",
"meta": ["pool"],
"errorMessage": "Pool name must be provided and cannot contain spaces"
},
"sample_bam": {
"type": "string",
"format": "file-path",
"exists": true,
"errorMessage": "Sample BAM/CRAM file must be provided, cannot contain spaces and must have extension '.bam' or '.cram'"
},
"sample_bam_index": {
"type": "string",
"format": "file-path",
"exists": true,
"errorMessage": "Sample BAM/CRAM index file must be provided, cannot contain spaces and must have extension '.bai' or '.csi'"
},
"snp_fastq_1": {
"type": "string",
"format": "file-path",
"exists": true,
"pattern": "^\\S+\\.f(ast)?q\\.gz$",
"errorMessage": "FastQ file for reads 1 must be provided, cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'"
},
"fastq_2": {
"snp_fastq_2": {
"type": "string",
"format": "file-path",
"exists": true,
"pattern": "^\\S+\\.f(ast)?q\\.gz$",
"errorMessage": "FastQ file for reads 2 cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'"
},
"snp_bam": {
"type": "string",
"format": "file-path",
"exists": true,
"errorMessage": "snp BAM/CRAM file must be provided, cannot contain spaces and must have extension '.bam' or '.cram'"
},
"snp_bam_index": {
"type": "string",
"format": "file-path",
"exists": true,
"errorMessage": "snp BAM/CRAM index file must be provided, cannot contain spaces and must have extension '.bai' or '.csi'"
}
},
"required": ["sample", "fastq_1"]
"AnyOf": [
matthdsm marked this conversation as resolved.
Show resolved Hide resolved
{
"required": ["sample", "sample_bam", "snp_fastq_1", "snp_fastq_2"]
},
{
"required": ["sample", "sample_bam", "snp_bam"]
}
]
}
}
Loading
Loading