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
3 changes: 3 additions & 0 deletions .groovylintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"DuplicateListLiteral": {
"enabled": false
},
"DuplicateNumberLiteral": {
"enabled": false
},
"DuplicateStringLiteral": {
"enabled": false
}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.2.3

Added `tissue` samples to the vivar samplesheet

## 0.2.2

Removed the `sex` field and added the `proband` field to the vivar samplesheet
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:5.3.2'
}

version = '0.2.2'
version = '0.2.3'

nextflowPlugin {
nextflowVersion = '25.10.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,13 @@ class PipelineObserver implements TraceObserverV2 {
* @param basePath the base path for which to get the sample name
* @return the sample name for the given base path
*/
protected String safeGetSample(String basePath) {
protected String safeGetSample(String inputBasePath) {
String basePath
// Make sure SNP tracking data will be added to the correct sample
if (basePath.startsWith('snp_')) {
basePath = basePath.replaceFirst('snp_', '')
basePath = inputBasePath.replaceFirst('snp_', '')
} else {
basePath = inputBasePath
}
List<String> possibleSamples = samples
.findAll { sample -> basePath.startsWith(sample) }.toList() as List<String>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,9 @@ class PreprocessingObserver extends PipelineObserver {
creator.dump(
entries
.findAll { entry ->
String type = entry.value.get('sample_type')?.toLowerCase()
// Only create samplesheet for DNA samples
entry.value.get('sample_type')?.toLowerCase() == 'dna'
type == 'dna' || type == 'tissue'
}
.values()
*.subKeys([
Expand Down
Loading