Fix `channel_settings` since it's a list of dicts, not a dict #14984

soapy1 · 2025-07-03T16:09:56Z

Description

This PR fixes the EnvironmentConfig model so that the channel_settings field is a list of dict instead of a dict.

From the context object, channel settings are defined as:

channel_settings = ParameterLoader(
        SequenceParameter(MapParameter(PrimitiveParameter("", element_type=str)))
    )

A single channel setting takes the form:

{
  "channel": channel_name,
  "param": value,
}

So, merging channel settings should also merge these dicts, based on matching channel keys.

Checklist - did you ...

Add a file to the news directory (using the template) for the next release's release notes?
Add / update necessary tests?
Add / update outdated documentation?

soapy1 · 2025-07-03T16:12:19Z

pre-commit.ci autofix

codspeed-hq · 2025-07-03T16:44:36Z

CodSpeed Instrumentation Performance Report

Merging #14984 will not alter performance

_{Comparing soapy1:channel-settings-is-list (68bed0c) with main (8665808)}

Summary

✅ 21 untouched benchmarks

jaimergp

Couple of extra newlines that need to be removed, but looks good otherwise!

conda/models/environment.py

news/14984-environment-config-channel-settings

jezdez

Updated it a little to use functools/itertools

conda/models/environment.py

jezdez · 2025-07-08T11:28:06Z

pre-commit.ci autofix

conda/models/environment.py

jezdez · 2025-07-08T16:27:09Z

this undoes my changes to this PR

conda/models/environment.py

soapy1 · 2025-07-08T16:32:42Z

this undoes my changes to this PR

Ah, that's my bad. I rebased to fix merge conflicts. Sorry about that

Channel settings should be merged with like "channels".

Co-authored-by: jaimergp <jaimergp@users.noreply.github.com>

…proved readability and efficiency. The new implementation simplifies the construction of the result list by using a dictionary comprehension.

…ed clarity and efficiency.

conda-bot added this to 🔎 Review Jul 3, 2025

github-project-automation bot moved this to 🆕 New in 🔎 Review Jul 3, 2025

soapy1 force-pushed the channel-settings-is-list branch from 78dbb79 to 3060d52 Compare July 3, 2025 16:10

conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jul 3, 2025

soapy1 marked this pull request as ready for review July 3, 2025 16:12

soapy1 requested a review from a team as a code owner July 3, 2025 16:12

soapy1 force-pushed the channel-settings-is-list branch 2 times, most recently from 669a226 to e5b3cf1 Compare July 3, 2025 16:28

soapy1 force-pushed the channel-settings-is-list branch from e5b3cf1 to 5aa3cd1 Compare July 3, 2025 16:45

jaimergp previously approved these changes Jul 4, 2025

View reviewed changes

conda/models/environment.py Outdated Show resolved Hide resolved

news/14984-environment-config-channel-settings Show resolved Hide resolved

github-project-automation bot moved this from 🆕 New to ✅ Approved in 🔎 Review Jul 4, 2025

soapy1 dismissed jaimergp’s stale review via 05ebe2d July 6, 2025 02:10

jaimergp previously approved these changes Jul 6, 2025

View reviewed changes

jezdez dismissed jaimergp’s stale review via 8772b72 July 8, 2025 10:25

jezdez previously approved these changes Jul 8, 2025

View reviewed changes

jezdez changed the title ~~channel_settings is a list of dicts, not a dict~~ Fix channel_settings since it's a list of dicts, not a dict Jul 8, 2025

jezdez enabled auto-merge (squash) July 8, 2025 10:58

jaimergp reviewed Jul 8, 2025

View reviewed changes

conda/models/environment.py Show resolved Hide resolved

jezdez dismissed their stale review via 3ac321d July 8, 2025 11:05

jezdez previously approved these changes Jul 8, 2025

View reviewed changes

pre-commit-ci bot dismissed jezdez’s stale review via 6639bb9 July 8, 2025 11:28

jezdez previously approved these changes Jul 8, 2025

View reviewed changes

jezdez reviewed Jul 8, 2025

View reviewed changes

conda/models/environment.py Outdated Show resolved Hide resolved

jezdez dismissed their stale review via 3831beb July 8, 2025 15:14

soapy1 force-pushed the channel-settings-is-list branch from 3831beb to a8a959e Compare July 8, 2025 15:58

jezdez requested changes Jul 8, 2025

View reviewed changes

conda/models/environment.py Outdated Show resolved Hide resolved

github-project-automation bot moved this from ✅ Approved to 🏗️ In Progress in 🔎 Review Jul 8, 2025

jezdez force-pushed the channel-settings-is-list branch from 3600b7e to 49ac93d Compare July 8, 2025 16:37

soapy1 and others added 6 commits July 8, 2025 09:43

channel_settings is a list of dicts, not a dict

27960f4

Channel settings should be merged with like "channels".

Add news

51cb48e

[pre-commit.ci] auto fixes from pre-commit.com hooks

6e93b7a

Apply suggestions from code review

30b8d1f

Co-authored-by: jaimergp <jaimergp@users.noreply.github.com>

Updated the merging of channel settings to use itertools.chain for im…

8e452ca

…proved readability and efficiency. The new implementation simplifies the construction of the result list by using a dictionary comprehension.

Refactor config merging in EnvironmentConfig to use reduce for improv…

28991b2

…ed clarity and efficiency.

soapy1 force-pushed the channel-settings-is-list branch from 49ac93d to 32781b0 Compare July 8, 2025 16:45

Fix import to use itertools.

2b7add2

soapy1 force-pushed the channel-settings-is-list branch from 32781b0 to 2b7add2 Compare July 8, 2025 17:09

jezdez approved these changes Jul 8, 2025

View reviewed changes

github-project-automation bot moved this from 🏗️ In Progress to ✅ Approved in 🔎 Review Jul 8, 2025

Merge branch 'main' into channel-settings-is-list

68bed0c

kenodegard approved these changes Jul 8, 2025

View reviewed changes

jezdez merged commit dbc5b07 into conda:main Jul 8, 2025
75 checks passed

github-project-automation bot moved this from ✅ Approved to 🏁 Done in 🔎 Review Jul 8, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix `channel_settings` since it's a list of dicts, not a dict #14984

Fix `channel_settings` since it's a list of dicts, not a dict #14984

Uh oh!

soapy1 commented Jul 3, 2025 •

edited

Loading

Uh oh!

soapy1 commented Jul 3, 2025

Uh oh!

codspeed-hq bot commented Jul 3, 2025 •

edited

Loading

Uh oh!

jaimergp left a comment

Uh oh!

Uh oh!

Uh oh!

jezdez left a comment

Uh oh!

Uh oh!

jezdez commented Jul 8, 2025

Uh oh!

Uh oh!

jezdez commented Jul 8, 2025 •

edited

Loading

Uh oh!

Uh oh!

soapy1 commented Jul 8, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Fix channel_settings since it's a list of dicts, not a dict #14984

Fix channel_settings since it's a list of dicts, not a dict #14984

Uh oh!

Conversation

soapy1 commented Jul 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist - did you ...

Uh oh!

soapy1 commented Jul 3, 2025

Uh oh!

codspeed-hq bot commented Jul 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CodSpeed Instrumentation Performance Report

Merging #14984 will not alter performance

Summary

Uh oh!

jaimergp left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jezdez left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jezdez commented Jul 8, 2025

Uh oh!

Uh oh!

jezdez commented Jul 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

soapy1 commented Jul 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Fix `channel_settings` since it's a list of dicts, not a dict #14984

Fix `channel_settings` since it's a list of dicts, not a dict #14984

soapy1 commented Jul 3, 2025 •

edited

Loading

codspeed-hq bot commented Jul 3, 2025 •

edited

Loading

jezdez commented Jul 8, 2025 •

edited

Loading

soapy1 commented Jul 8, 2025 •

edited

Loading