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.

Sign up for GitHub

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

Jump to bottom

fix lockfiles with overrides #13597

Merged
merged 35 commits into from
May 4, 2023
Merged

fix lockfiles with overrides #13597

merged 35 commits into from
May 4, 2023

Conversation

memsharded
Copy link
Member

Changelog: Bugfix: Solve failing lockfiles when graph has requirements with override=True
Docs: Omit

Test lock_install_test.py has been removed, the conan lock install has been completely removed in 2.0, with no replacement.

Close #13519

@memsharded memsharded added this to the 2.0.3 milestone Apr 2, 2023
@memsharded memsharded requested a review from AbrilRBS April 2, 2023 23:46
@memsharded memsharded self-assigned this Apr 2, 2023
@memsharded memsharded mentioned this pull request Apr 2, 2023
Closed
@memsharded memsharded marked this pull request as draft April 3, 2023 08:04
@memsharded memsharded modified the milestones: 2.0.3, 2.0.4 Apr 3, 2023
@memsharded memsharded closed this Apr 3, 2023
@memsharded memsharded reopened this Apr 3, 2023
@memsharded memsharded mentioned this pull request Apr 11, 2023
Merged
@memsharded memsharded modified the milestones: 2.0.4, 2.0.5 Apr 11, 2023
@memsharded memsharded mentioned this pull request Apr 14, 2023
Closed
@memsharded memsharded marked this pull request as ready for review April 21, 2023 15:54
@memsharded memsharded requested a review from jcar87 April 21, 2023 15:55
AbrilRBS
AbrilRBS approved these changes Apr 24, 2023
View reviewed changes
conans/model/graph_lock.py Show resolved Hide resolved
This was referenced Apr 24, 2023
Merged
Closed
AbrilRBS added a commit that referenced this pull request Apr 24, 2023
@AbrilRBS
fix lock merge of lockfiles with alias (#13763)
731dd1c 
Changelog: Bugfix: Fix ``conan lock merge`` of lockfiles containing
alias
Docs: Omit

Coming from #13597
@memsharded memsharded merged commit c4abdb5 into conan-io:release/2.0 May 4, 2023
@memsharded memsharded deleted the fix/lockfiles_overrides branch May 4, 2023 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AbrilRBS AbrilRBS AbrilRBS approved these changes

@jcar87 jcar87 Awaiting requested review from jcar87

Assignees

@czoido czoido

@memsharded memsharded

Labels
None yet
Projects
None yet
Milestone
2.0.5
Development

Successfully merging this pull request may close these issues.

[bug] openssl version conflict, even with override=True
3 participants
@memsharded @AbrilRBS @czoido