8000
Fix channel args cli #10735
Merged
Fix channel args cli #10735
Conversation
This file contains hidden or 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
ericpre
commented
Jun 20, 2021
tests/base/test_context.py
Outdated
Comment on lines
345
to
388
| def test_channels_defaults(self): | ||
| # no channels provided in cli | ||
| reset_context(()) | ||
| assert context.channels == ('defaults', ) | ||
|
|
||
| def test_channels_defaults_condarc(self): | ||
| # no channels provided in cli | ||
| reset_context(()) | ||
| string = dals(""" | ||
| channels: ['defaults', 'conda-forge'] | ||
| """) | ||
| rd = odict(testdata=YamlRawParameter.make_raw_parameters('testdata', yaml_round_trip_load(string))) | ||
| context._set_raw_data(rd) | ||
| assert context.channels == ('defaults', 'conda-forge') | ||
|
|
||
| def test_specify_channels_cli_adding_defaults_no_condarc(self): | ||
| # When the channel haven't been specified in condarc, 'defaults' | ||
| # should be present when specifying channel in the cli | ||
| reset_context((), argparse_args=AttrDict(channel=['conda-forge'])) | ||
| assert context.channels == ('conda-forge', 'defaults') | ||
|
|
||
| def test_specify_channels_cli_condarc(self): | ||
| # When the channel have been specified in condarc, these channels | ||
| # should be used along with the one specified | ||
| reset_context((), argparse_args=AttrDict(channel=['conda-forge'])) | ||
| string = dals(""" | ||
| channels: ['defaults', 'conda-forge'] | ||
| """) | ||
| rd = odict(testdata=YamlRawParameter.make_raw_parameters('testdata', yaml_round_trip_load(string))) | ||
| context._set_raw_data(rd) | ||
| assert context.channels == ('defaults', 'conda-forge') | ||
|
|
||
| def test_specify_different_channels_cli_condarc(self): | ||
| # When the channel have been specified in condarc, these channels | ||
| # should be used along with the one specified | ||
| # In this test, the given channel in cli is different from condarc | ||
| # 'defaults' should not be added | ||
| reset_context((), argparse_args=AttrDict(channel=['other'])) | ||
| string = dals(""" | ||
| channels: ['conda-forge'] | ||
| """) | ||
| rd = odict(testdata=YamlRawParameter.make_raw_parameters('testdata', yaml_round_trip_load(string))) | ||
| context._set_raw_data(rd) | ||
| assert context.channels == ('conda-forge', 'other') |
There was a problem hiding this comment.
These tests check the current behaviour and pass without this PR.
ericpre
commented
Jun 20, 2021
|
At first, it was not clear to me when the |
ericpre
commented
Jun 20, 2021
| @@ -720,11 +720,23 @@ def channels(self): | |||
| if self._argparse_args and 'channel' in self._argparse_args: | |||
There was a problem hiding this comment.
This if block is necessary to cover the case in test_specify_channels_cli_adding_defaults_no_condarc.
jezdez
requested changes
Jun 22, 2021
Co-authored-by: Jannis Leidel <jannis@leidel.info>
|
Thanks @jezdez for the review, I have applied your suggestions! |
jezdez
approved these changes
Jun 23, 2021
FaustinCarter
pushed a commit
to FaustinCarter/conda
that referenced
this pull request
Nov 27, 2021
* Don't add 'defaults' channels when not necessary * Add config_files property to Context class to avoid duplicating code * Apply suggestions from code review: improve docstring and formatting Co-authored-by: Jannis Leidel <jannis@leidel.info>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fix #10732.