Fix large comment block headers so they don't cause phantom merge con… #6755
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mashehu
approved these changes
Oct 8, 2024
|
wait, you removed the harshil alignment 😱 |
Ben made me do it though 👀 What do I do 😱 |
|
I thought ben's secret thing followed harshil alignment. in any case in nf-core harshil alignment > ben |
|
No apparnetluy not everywhere... I guess I'll go start from scratch then... 😢 |
mirpedrol
approved these changes
Oct 9, 2024
mashehu
approved these changes
Oct 9, 2024
|
Thank you @mirpedrol ! |
bentsherman
reviewed
Oct 9, 2024
Comment on lines
-114
to
+120
| log.warn "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + | ||
| " There is a problem with your Conda configuration!\n\n" + | ||
| " You will need to set-up the conda-forge and bioconda channels correctly.\n" + | ||
| " Please refer to https://bioconda.github.io/\n" + | ||
| " The observed channel order is \n" + | ||
| " ${channels}\n" + | ||
| " but the following channel order is required:\n" + | ||
| " ${required_channels_in_order}\n" + | ||
| "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" | ||
| log.warn( | ||
| "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + " There is a problem with your Conda configuration!\n\n" + " You will need to set-up the conda-forge and bioconda channels correctly.\n" + " Please refer to https://bioconda.github.io/\n" + " The observed channel order is \n" + " ${channels}\n" + " but the following channel order is required:\n" + " ${required_channels_in_order}\n" + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" | ||
| ) |
There was a problem hiding this comment.
I tried to preserve the formatting here but found it to be tricky, probably a multi-line string would be better anyway:
log.warn """\
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
There is a problem with your Conda configuration!
You will need to set-up the conda-forge and bioconda channels correctly.
Please refer to https://bioconda.github.io/
The observed channel order is
${channels}
but the following channel order is required:
${required_channels_in_order}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
""".stripIndent(true)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…flicts
PR checklist
Closes #XXX
versions.ymlfile.labelnf-core modules test <MODULE> --profile dockernf-core modules test <MODULE> --profile singularitynf-core modules test <MODULE> --profile condanf-core subworkflows test <SUBWORKFLOW> --profile dockernf-core subworkflows test <SUBWORKFLOW> --profile singularitynf-core subworkflows test <SUBWORKFLOW> --profile conda