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

Bulk change conda syntax for all modules #2654

Merged
merged 7 commits into from
Dec 13, 2022
Merged

Conversation

drpatelh
Copy link
Member

@maxulysse maxulysse self-requested a review December 13, 2022 20:00
Copy link
Member

@maxulysse maxulysse left a comment

Choose a reason for hiding this comment

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

LGTM, we should remove the enable conda params from the template before the next tools release though

@@ -2,9 +2,6 @@ process GATK4_DETERMINEGERMLINECONTIGPLOIDY {
tag "$meta.id"
label 'process_single'

if(params.enable_conda){
error "Conda environments cannot be used for GATK4/DetermineGermlineContigPloidy at the moment. Please use docker or singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

Copy link
Member Author

Choose a reason for hiding this comment

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

Don't know. It has to be tested but this will only affect a small minority of modules so we can add that afterwards. All of the modules I removed it from can be found in the commits I labelled Remove error raise for modules that dont support conda above.

@@ -3,9 +3,6 @@ process GATK4_CNNSCOREVARIANTS {
label 'process_low'

//Conda is not supported at the moment: https://github.com/broadinstitute/gatk/issues/7811
if (params.enable_conda) {
exit 1, "Conda environments cannot be used for GATK4/CNNScoreVariants at the moment. Please use docker or singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

@@ -2,6 +2,7 @@ process FLASH {
tag "$meta.id"
label 'process_medium'

conda "bioconda::flash=1.2.11"
Copy link
Member

Choose a reason for hiding this comment

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

There was no conda before?

Copy link
Member Author

Choose a reason for hiding this comment

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

Nope!

@@ -2,10 +2,6 @@ process FCS_FCSGX {
tag "$meta.id"
label 'process_low'

if (params.enable_conda) {
exit 1, "Conda environments cannot be used when using the FCS tool. Please use docker or singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

@@ -2,9 +2,6 @@ process FCS_FCSADAPTOR {
tag "$meta.id"
label 'process_low'

if (params.enable_conda) {
exit 1, "Conda environments cannot be used when using the FCS tool. Please use docker or singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

@@ -2,11 +2,6 @@ process DEEPVARIANT {
tag "$meta.id"
label 'process_medium'


if (params.enable_conda) {
exit 1, "Conda environments cannot be used with DeepVariant at the moment. Please use Docker or Singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

@@ -2,9 +2,6 @@ process CELLRANGER_MKREF {
tag "$fasta"
label 'process_high'

if (params.enable_conda) {
exit 1, "Conda environments cannot be used when using the Cell Ranger tool. Please use docker or singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

@@ -2,9 +2,6 @@ process CELLRANGER_MKGTF {
tag "$gtf"
label 'process_low'

if (params.enable_conda) {
exit 1, "Conda environments cannot be used when using the Cell Ranger tool. Please use docker or singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

@@ -2,9 +2,6 @@ process CELLRANGER_MKFASTQ {
tag "mkfastq"
label 'process_medium'

if (params.enable_conda) {
exit 1, "Conda environments cannot be used when using the Cell Ranger tool. Please use docker or singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

@@ -2,9 +2,6 @@ process CELLRANGER_COUNT {
tag "$meta.gem"
label 'process_high'

if (params.enable_conda) {
exit 1, "Conda environments cannot be used when using the Cell Ranger tool. Please use docker or singularity containers."
Copy link
Member

Choose a reason for hiding this comment

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

Can we keep an error message when using conda?

@drpatelh drpatelh merged commit c8e35eb into nf-core:master Dec 13, 2022
@JoseEspinosa JoseEspinosa mentioned this pull request Dec 13, 2022
14 tasks
@@ -2,7 +2,7 @@ process ABRICATE_RUN {
tag "$meta.id"
label 'process_medium'

conda (params.enable_conda ? "bioconda::abricate=1.0.1" : null)
conda "bioconda::abricate=1.0.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/abricate%3A1.0.1--ha8f3691_1':
Copy link
Contributor

@SPPearce SPPearce Dec 14, 2022

Choose a reason for hiding this comment

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

Why does this have the URL encoding %3A instead of :? (And another 7 places)

Copy link
Member Author

Choose a reason for hiding this comment

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

Excellent spot 👀 Not sure but it has happened before and we should probably look for it and remove in any affected modules.

@muffato muffato mentioned this pull request Dec 15, 2022
14 tasks
nvnieuwk added a commit that referenced this pull request Feb 28, 2023
* new module survivor/merge

* fix versions

* review updates

* add stubs

* fix tests

* changed conda according to #2654

* moved the args to input vals

* update meta

* update to latest decision

* fix test

* Update modules/nf-core/survivor/merge/main.nf

Co-authored-by: Jonathan Manning <[email protected]>

---------

Co-authored-by: Jonathan Manning <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants