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

Massive conda update #1663

Merged
merged 42 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
019ddfa
massive modules conda update
maxulysse Sep 23, 2024
2cca752
update CHANGELOG
maxulysse Sep 23, 2024
ff213d1
use new deepvariant module
maxulysse Sep 23, 2024
6dcf5cb
typo
maxulysse Sep 23, 2024
11aa12b
fix MULTIQC
maxulysse Sep 23, 2024
506112c
fix bcftools_annotate usage
maxulysse Sep 23, 2024
c76ba99
Merge branch 'dev' into massive_conda_update
maxulysse Sep 23, 2024
77621d4
remove modules that should not have been installed
maxulysse Sep 23, 2024
08b3ebf
trying to make sure we run with profile test
maxulysse Sep 23, 2024
96aa52e
fix a couple tests
maxulysse Sep 23, 2024
102ea37
exclude tests for diff
maxulysse Sep 23, 2024
8368eae
exclude tests because of missing dependency
maxulysse Sep 23, 2024
8c5e8e7
add default values for new options
maxulysse Sep 23, 2024
ac569b4
fix usage
maxulysse Sep 23, 2024
92e3907
typo
maxulysse Sep 23, 2024
2dd70b9
Update CHANGELOG.md
maxulysse Sep 23, 2024
a2a1462
fix bcftools annotate usage
maxulysse Sep 23, 2024
474a9da
Merge branch 'dev' into massive_conda_update
maxulysse Sep 23, 2024
73c9f0e
exclude tests because of missing dependency
maxulysse Sep 23, 2024
782d0a9
Fix default value
maxulysse Sep 24, 2024
1c02dfd
fix usage of GATK4_GENOTYPEGVCFS
maxulysse Sep 24, 2024
d61d456
fix expected content
maxulysse Sep 24, 2024
f939581
exclude tests coming from modules
maxulysse Sep 24, 2024
4e5adf4
fix usage
maxulysse Sep 24, 2024
2c4225a
exclude tests coming from modules + use debug
maxulysse Sep 24, 2024
240db8d
update CHANGELOG
maxulysse Sep 24, 2024
f148972
properly update samtools
maxulysse Sep 24, 2024
42d9e32
fix expected filename
maxulysse Sep 24, 2024
d080950
Merge branch 'dev' into massive_conda_update
maxulysse Oct 3, 2024
04ee9bd
Merge branch 'dev' into massive_conda_update
maxulysse Oct 3, 2024
379a395
update snapshot
maxulysse Oct 3, 2024
a259f23
update MultiQC
maxulysse Oct 3, 2024
a0276b0
add pdiff
maxulysse Oct 3, 2024
9439e62
proper indent of comment
maxulysse Oct 3, 2024
ad029e3
add junitxml
maxulysse Oct 3, 2024
0ce964c
update .nftignore and snap
maxulysse Oct 3, 2024
e9d4301
update nftignore
maxulysse Oct 3, 2024
1856529
enhance pdiff
maxulysse Oct 3, 2024
2cb5136
patch deepvariant tests
maxulysse Oct 3, 2024
d8e83d8
fix path
maxulysse Oct 3, 2024
edd0624
actually add the file
maxulysse Oct 3, 2024
08be956
no md5sum
maxulysse Oct 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 18 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ on:
- dev

env:
NFTEST_VER: "0.9.0"
NFT_DIFF: "pdiff"
NFT_DIFF_ARGS: "--line-numbers --width 120 --expand-tabs=2"
NFT_VER: "0.9.0"
NFT_WORKDIR: "~"
NXF_ANSI_LOG: false
TEST_DATA_BASE: "${{ github.workspace }}/test-datasets"
SENTIEON_LICENSE_BASE64: ${{ secrets.SENTIEON_LICENSE_BASE64 }}
NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity
NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity
SENTIEON_LICENSE_BASE64: ${{ secrets.SENTIEON_LICENSE_BASE64 }}
TEST_DATA_BASE: "${{ github.workspace }}/test-datasets"

# Cancel if a newer run is started
concurrency:
Expand Down Expand Up @@ -238,13 +241,16 @@ jobs:
- tags: "cnvkit/antitarget"
- tags: "cnvkit/batch"
- tags: "cnvkit/reference"
- tags: "deepvariant"
- tags: "controlfreec/assesssignificance"
- tags: "controlfreec/freec"
- tags: "deepvariant/rundeepvariant"
- tags: "dragmap/align"
- tags: "dragmap/hashtable"
- tags: "ensemblvep/download"
- tags: "ensemblvep/vep"
- tags: "fastp"
- tags: "fastqc"
- tags: "fgbio/callmolecularconsensusreads"
- tags: "fgbio/fastqtobam"
- tags: "freebayes"
- tags: "gatk4/applybqsr"
Expand All @@ -266,18 +272,17 @@ jobs:
- tags: "samtools/convert"
- tags: "samtools/mpileup"
- tags: "samtools/stats"
- tags: "sentieon/bwamem"
- tags: "sentieon/haplotyper"
- tags: "snpeff/snpeff"
- tags: "spring/decompress"
- tags: "strelka/germline"
- tags: "strelka/somatic"
- tags: "subworkflows/utils_nfvalidation_plugin"
- tags: "tabix/bgziptabix"
- tags: "tabix/tabix"
- tags: "tiddit/sv"
- tags: "untar"
- tags: "pipeline_sarek"
include:
- tags: "pipeline_sarek"
profile: "test,docker"

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -295,7 +300,7 @@ jobs:
- name: Install nf-test
uses: nf-core/setup-nf-test@v1
with:
version: ${{ env.NFTEST_VER }}
version: ${{ env.NFT_VER }}

- name: Setup apptainer
if: matrix.profile == 'singularity'
Expand Down Expand Up @@ -339,13 +344,15 @@ jobs:
- name: Disk space cleanup
uses: jlumbroso/free-disk-space@v1.3.1

# Test the module
# Test the component
- name: Run nf-test
run: |
nf-test test \
--profile=${{ matrix.profile }} \
--profile="+${{ matrix.profile }}" \
--tag ${{ matrix.tags }} \
--tap=test.tap \
--junitxml=test.xml \
--debug \
--verbose

confirm-pass:
Expand Down
18 changes: 15 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [1642](https://github.com/nf-core/sarek/pull/1642) - Back to dev
- [1653](https://github.com/nf-core/sarek/pull/1653) - Updates `sarek_subway` files with `lofreq`
- [1660](https://github.com/nf-core/sarek/pull/1642) - Add `--length_required` for minimal reads length with `FASTP`
- [1663](https://github.com/nf-core/sarek/pull/1663) - Massive conda modules update

### Changed

Expand All @@ -29,12 +30,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Dependencies

| Dependency | Old version | New version |
| ---------- | ----------- | ----------- |
| `lofreq` | | 2.1.5 |
| Dependency | Old version | New version |
| ------------- | ----------- | ----------- |
| `deepvariant` | 1.5.0 | 1.6.1 |
| `ensemblvep` | 111.0 | 112.0 |
| `fgbio` | 2.0.2 | 2.1.2 |
| `htslib` | 1.20 | 1.21 |
| `lofreq` | | 2.1.5 |
| `multiqc` | 1.21 | 1.25.1 |
| `samtools` | 1.20 | 1.21 |

### Parameters

| Params | Status |
| --------------- | ------- |
| `snpeff_db` | Updated |
| `snpeff_genome` | Removed |

## [3.4.4](https://github.com/nf-core/sarek/releases/tag/3.4.4) - Ruopsokjåkhå

Ruopsokjåkhå is another peak of the Pårte massif.
Expand Down
4 changes: 2 additions & 2 deletions conf/modules/annotate.config
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ process {
// BCFTOOLS ANNOTATE
if (params.tools && params.tools.split(',').contains('bcfann')) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

    // ALL ANNOTATION TOOLS
    if (params.tools && (params.tools.split(',').contains('snpeff') || params.tools.split(',').contains('vep') || params.tools.split(',').contains('merge') || params.tools.split(',').contains('bcfann'))) {
        withName: 'NFCORE_SAREK:SAREK:VCF_ANNOTATE_ALL:.*:(TABIX_BGZIPTABIX|TABIX_TABIX)' {
            ext.prefix = { input.name - '.vcf' }
            publishDir = [
                    mode: params.publish_dir_mode,
                    path: { "${params.outdir}/annotation/${meta.variantcaller}/${meta.id}/" },
                    pattern: "*{gz.tbi}"
            ]
        }
    }

    if (params.tools && (params.tools.split(',').contains('snpeff') || params.tools.split(',').contains('merge'))) {
        withName: 'NFCORE_SAREK:SAREK:VCF_ANNOTATE_ALL:VCF_ANNOTATE_SNPEFF:TABIX_BGZIPTABIX' {
            publishDir = [
                mode: params.publish_dir_mode,
                path: { "${params.outdir}/annotation/${meta.variantcaller}/${meta.id}/" },
                pattern: "*{gz,gz.tbi}",
                saveAs: { params.tools.split(',').contains('snpeff') ? it : null }
            ]
        }
    }
    ```
    
    This could be cleaned up I think?

withName: 'NFCORE_SAREK:SAREK:VCF_ANNOTATE_ALL:VCF_ANNOTATE_BCFTOOLS:BCFTOOLS_ANNOTATE' {
ext.args = { '--output-type z' }
ext.args = { '--output-type z --write-index=tbi' }
ext.prefix = { input.baseName - '.vcf' + '_BCF.ann' }
publishDir = [
mode: params.publish_dir_mode,
path: { "${params.outdir}/annotation/${meta.variantcaller}/${meta.id}/" },
pattern: "*{gz}"
pattern: "*{gz,gz.tbi}"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions conf/modules/deepvariant.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

process {

withName: 'DEEPVARIANT' {
ext.args = { params.wes ? "--model_type WES" : "--model_type WGS" }
withName: 'DEEPVARIANT_RUNDEEPVARIANT' {
ext.args = { params.wes ? "--model_type=WES" : "--model_type=WGS" }
ext.prefix = { meta.num_intervals <= 1 ? "${meta.id}.deepvariant" : "${meta.id}.deepvariant.${intervals.baseName}" }
ext.when = { params.tools && params.tools.split(',').contains('deepvariant') }
publishDir = [
Expand Down
2 changes: 1 addition & 1 deletion conf/modules/umi.config
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ process {
}

withName: 'CALLUMICONSENSUS' {
ext.args = { '-M 1 -S Coordinate' }
ext.args = { '-S Coordinate' }
ext.prefix = { "${meta.id}_umi-consensus" }
publishDir = [
path: { "${params.outdir}/preprocessing/umi/${meta.sample}" },
Expand Down
23 changes: 23 additions & 0 deletions conf/test/tools_germline_deepvariant.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Nextflow config file for running minimal tests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Defines input files and everything required to run a fast and simple pipeline test.

Use as follows:
nextflow run nf-core/sarek -profile test,<extra_test_profile>,<docker/singularity> --outdir <OUTDIR>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/

params {
input = "${projectDir}/tests/csv/3.0/mapped_single_cram.csv"
genome = null
igenomes_ignore = true
fasta = "${params.modules_testdata_base_path}/genomics/homo_sapiens/genome/genome.fasta"
fasta_fai = "${params.modules_testdata_base_path}/genomics/homo_sapiens/genome/genome.fasta.fai"
intervals = "${params.modules_testdata_base_path}/genomics/homo_sapiens/genome/genome.bed"
nucleotides_per_second = 20
step = 'variant_calling'
tools = null
wes = true
}
Loading