Skip to content

fix(packagesettings): reject cross-level (package level and variant level) settings conflicts for source - #1369

Merged
LalatenduMohanty merged 1 commit into
new-resolver-configfrom
codex/issue-1368-validation
Oct 22, 2026
Merged

fix(packagesettings): reject cross-level (package level and variant level) settings conflicts for source#1369
LalatenduMohanty merged 1 commit into
new-resolver-configfrom
codex/issue-1368-validation

Conversation

@smoparth

@smoparth smoparth commented Oct 14, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Reject conflicting new resolver "source" and legacy settings during package settings loading, including explicit pre_built: false. Cover both configuration directions with focused tests and document the rule.

Closes: #1368

Pull Request Description

What

Why

@smoparth
smoparth requested a review from a team as a code owner October 14, 2026 14:57
@coderabbitai

coderabbitai Bot commented Oct 14, 2026 •
edited
Loading

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@mergify mergify Bot added the ci label Oct 14, 2026
@smoparth smoparth changed the title fix(packagesettings): reject cross-level source conflicts fix(packagesettings): reject cross-level (package level and variant level) source conflicts Oct 14, 2026
@smoparth smoparth changed the title fix(packagesettings): reject cross-level (package level and variant level) source conflicts fix(packagesettings): reject cross-level (package level and variant level) settings conflicts for source Oct 14, 2026
rd4398
rd4398 previously approved these changes Oct 14, 2026
View reviewed changes

@rd4398 rd4398 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks good, I left a non-blocking comment which can be a follow up.

Comment thread src/fromager/packagesettings/_models.py Resolved
@smoparth
smoparth force-pushed the codex/issue-1368-validation branch from 118438d to cc28550 Compare October 14, 2026 15:20
rd4398
rd4398 previously approved these changes Oct 14, 2026
View reviewed changes

@rd4398 rd4398 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the quick fix!

@mergify

mergify Bot commented Oct 14, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

This pull request does not currently match the merge queue conditions, so it cannot be queued from here. The box comes back if it matches again.

@jlarkin09

jlarkin09 commented Oct 21, 2026

Copy link
Copy Markdown
Contributor

LGTM!

LalatenduMohanty
LalatenduMohanty reviewed Oct 22, 2026
View reviewed changes
Comment thread src/fromager/packagesettings/_models.py Resolved
@smoparth
smoparth force-pushed the codex/issue-1368-validation branch from cc28550 to a3e850d Compare October 22, 2026 14:36
LalatenduMohanty
LalatenduMohanty reviewed Oct 22, 2026
View reviewed changes
Comment thread src/fromager/packagesettings/_models.py Resolved
@smoparth @codex
fix(packagesettings): reject cross-level source conflicts
ac8f01d 
Reject conflicting source and legacy settings during package settings loading, including explicit pre_built: false. Cover both configuration directions with focused tests and document the rule.

Co-Authored-By: Codex <codex@openai.com>
Closes: #1368
Signed-off-by: Shanmukh Pawan <smoparth@redhat.com>
@smoparth
smoparth force-pushed the codex/issue-1368-validation branch from a3e850d to ac8f01d Compare October 22, 2026 15:06
@LalatenduMohanty
LalatenduMohanty merged commit ba2613e into new-resolver-config Oct 22, 2026
41 checks passed

This branch was previously deployed

1 inactive deployment
release — ac8f01d9 Deployed Oct 22, 2026 by smoparth via Build and publish Python distributions to PyPI #1147
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LalatenduMohanty LalatenduMohanty LalatenduMohanty approved these changes
@rd4398 rd4398 Awaiting requested review from rd4398

Assignees

No one assigned

Labels

ci

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@smoparth @jlarkin09 @LalatenduMohanty @rd4398