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

0.2.1 #28

Merged
merged 38 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
3ddfaa9
add .gitattributes. set up git lfs for bed and pos files
TCLamnidis May 5, 2023
ab401af
merge branch 'main' into 'dev'
TCLamnidis Jun 19, 2023
8967b2c
Fix minotaur config name in template comments. Bump version
TCLamnidis Jun 19, 2023
6f2160f
Merge remote-tracking branch 'origin/main' into dev
TCLamnidis Jun 19, 2023
4133dd7
tweaks to gitattributes
TCLamnidis Jun 19, 2023
20cc6b7
Config versions now comma separated
TCLamnidis Jun 22, 2023
39a7b19
Use big_data profile. bump version
TCLamnidis Jun 22, 2023
d104b2d
Skip preseq by default. Bump version
TCLamnidis Jun 22, 2023
4975079
WIP minotaur packager.
TCLamnidis Jun 22, 2023
a5af138
Add Helptext
TCLamnidis Jul 17, 2023
4b57bf8
add version printing
TCLamnidis Jul 17, 2023
1f40593
Use package eager dir instead od data dir for validation input
TCLamnidis Jul 17, 2023
3b77b4d
work in progress
TCLamnidis Jul 21, 2023
d6bfcbf
in progress
TCLamnidis Aug 8, 2023
d77a6a1
initial commit
TCLamnidis Aug 8, 2023
d294bb2
Profile attributed separated by new lines
TCLamnidis Aug 31, 2023
5e3b049
some progress
TCLamnidis Aug 31, 2023
b7d766e
Add PoseidonYaml class for parsing
TCLamnidis Aug 31, 2023
dd689fa
Add janno parsing
TCLamnidis Aug 31, 2023
1b13764
typo in Minotaur version description
TCLamnidis Sep 11, 2023
d8bca8f
compiled eager results in table for janno
TCLamnidis Sep 11, 2023
d0ecaf6
fix janno dtypes
TCLamnidis Sep 11, 2023
b2818f2
reorder final janno. fix weighted mean
TCLamnidis Sep 13, 2023
753c259
wip
TCLamnidis Sep 13, 2023
5cf4f1a
add janno fill in and rectify package
TCLamnidis Sep 13, 2023
e8fef5f
announce janno population
TCLamnidis Sep 13, 2023
9c3878d
add checksums
TCLamnidis Sep 13, 2023
25e58cf
make executable
TCLamnidis Sep 13, 2023
ec63c4e
optional columns in poseidon yaml
TCLamnidis Sep 13, 2023
3cbd01a
Merge branch 'dev' of github.com:poseidon-framework/poseidon-eager in…
TCLamnidis Sep 13, 2023
54d2d68
Optional attributes in PoseidonYaml class
TCLamnidis Sep 13, 2023
c5975ea
Keep joined Library_Names
TCLamnidis Sep 13, 2023
802e45a
Add Contamination_Meas inference
TCLamnidis Sep 13, 2023
b722f84
Use package_oven_dir. publish packages to oven
TCLamnidis Sep 13, 2023
027d5ca
Fix CaptureType version string
TCLamnidis Sep 13, 2023
4590314
convert genotypes to PLINK
TCLamnidis Nov 2, 2023
7dad89b
Merge branch 'main' into dev
TCLamnidis Nov 2, 2023
5e3b1fc
Update Changelog
TCLamnidis Nov 2, 2023
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
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## All line endings should be linux file endings
* text eol=lf
## git lfs support for bed and pos files
*.pos filter=lfs diff=lfs merge=lfs -text
*.bed filter=lfs diff=lfs merge=lfs -text
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ eager/
*.finalised.tsv
array_Logs/
array_tempfiles/
testing_assets/
testing_assets/
poseidon_packages/
.tmp/
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,26 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v0.2.1dev - 02/11/2023

### `Added`

- `scripts/minotaur_packager.sh`: Script to create poseidon half-packages and fill in janno from eager results
- `scripts/populate_janno.py`: Script to fill in janno files with poseidon metadata from nf-core eager results.

### `Fixed`

- `scripts/validate_downloaded_data.sh`: Add helptext
- `scripts/run_eager.sh`: Now uses `big_data` profile
- Updates to templates for packages and configs. These are now defunct as they are pulled from the minotaur-recipes repo, and will be removed in netx release.
- `scripts/download_and_localise_package_files.sh` distinction between symlink dir and package_eager_dir.

### `Dependencies`

- nf-core/eager=2.4.6

### `Deprecated`

## v0.2.0dev - 25/04/2023

### `Added`
Expand Down
6 changes: 3 additions & 3 deletions assets/template.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Keep track of config versions
config_template_version='0.2.0dev'
package_config_version='0.2.0dev'
config_template_version='0.2.2dev'
package_config_version='0.2.2dev'

// This configuration file is designed to be a used with the nf-core/eager pipeline.
// Instead of having to specify all other configurations for the Minotaur pipeline
Expand All @@ -22,7 +22,7 @@ includeConfig '../../conf/CaptureType_profiles/1240K.config'

params {
// Keep track of config file versions used when processing
config_profile_description = "${config_profile_description}\nconfig_template_version: ${config_template_version}\npackage_config_version: ${package_config_version}"
config_profile_description = "${config_profile_description}, config_template_version: ${config_template_version}, package_config_version: ${package_config_version}"
config_profile_contact = "Thiseas C. Lamnidis (@TCLamnidis)"

/*
Expand Down
4 changes: 2 additions & 2 deletions conf/CaptureType_profiles/1240K.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Keep track of config versions
capturetype_config_version='0.2.0dev'
capturetype_config_version='0.2.2dev'

//TODO Backup all bed/snp files in the repo somewhere and use from central location instead of hard-coding paths.
// Profile specifying capture-specific parameters for packages of the '1240K' CaptureType.
params{
// Keep track of config file versions used when processing
config_profile_name = "${config_profile_name}, on 1240K sites"
config_profile_description="${config_profile_description}\n1240K.config: ${capturetype_config_version}"
config_profile_description="${config_profile_description}\n - CaptureType.1240K.config: ${capturetype_config_version}"

// Qualimap bedfile for on-target coverage calculation
snpcapture_bed = '/mnt/archgen/Reference_Genomes/Human/hs37d5/SNPCapBEDs/1240K.pos.list_hs37d5.0based.bed'
Expand Down
14 changes: 8 additions & 6 deletions conf/Minotaur.config
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
// Keep track of config versions
minotaur_config_version='0.2.0dev'
minotaur_config_version='0.2.1dev'

// Default parameters for processing of data through Minotaur workflow.
params{
// Keep track of config file versions used when processing
config_profile_name = "Minotaur pipeline config"
config_profile_description = "Minortaur.config: ${minotaur_config_version}"
config_profile_description = "Minotaur.config: ${minotaur_config_version}"
config_profile_url = 'https://github.com/poseidon-framework/poseidon-eager'

// Skip steps
skip_preseq = true // This data is published so won't be sequencing it more.

// Mapping
bwaalnn = 0.01

// BAM filtering
run_bam_filtering = true // Filter out unmapped reads, so barplots in MultiQC are not completely overtaken by unmapped reads.
bam_unmapped_type = 'fastq' // Keep unmapped reads as a separate fastq file. Preferred format for possible future pathogen screening.
bam_mapping_quality_threshold = 30 // Keep MapQ 30+ (together with snpcapture_bed is needed for poseidon "coverage on target SNPs" field)
// The above also means that reads that are mapped with MapQ below 30 are lost after filtering, not present in the fastq OR the filtered bam!

// mtDNA to nuclear ratio
run_mtnucratio = true
mtnucratio_header = "MT"

// Bam Trimming
run_trim_bam = true

// Double-stranded library clipping parameters
bamutils_clip_double_stranded_half_udg_left = 2 // Trim 2 bp of either side for dsDNA half-UDG libraries.
bamutils_clip_double_stranded_half_udg_right = 2 // Trim 2 bp of either side for dsDNA half-UDG libraries.
Expand Down
2 changes: 1 addition & 1 deletion packages/2021_PattersonNature/2021_PattersonNature.config
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ params {
https://nf-co.re/eager/2.4.6/parameters

You can see the default values for parameters within poseidon-eager at:
https://github.com/poseidon-framework/poseidon-eager/blob/main/conf/Poseidon.config
https://github.com/poseidon-framework/poseidon-eager/blob/main/conf/Minotaur.config
*/
}
Loading