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.

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

Override version ranges from downstream consumers #5713

Merged
merged 10 commits into from Oct 24, 2019

Conversation

@jgsogo
Copy link
Member

jgsogo commented Sep 5, 2019

Changelog: Bugfix: Downstream overrides to exact dependencies versions are always used, even if the upstream has a version range that does not satisfy the override.
Docs: Omit

Related to #5507

@jgsogo

This comment has been minimized.

Copy link
Member Author

jgsogo commented Sep 9, 2019

Proposal:

  • if the override comes from a version range, the check is performed and it should raise if it doesn't satisfy.
  • if the override comes from a full reference, no check.
jgsogo added 4 commits Sep 9, 2019
@@ -13,26 +13,3 @@ def verbose_version_test(self):
client.save({CONANFILE: str(conanfile)})
client.run("install . --build", assert_error=True)
self.assertIn("from requirement 'MyOtherPkg/[~0.1]@user/testing'", client.out)

def werror_fail_test(self):

This comment has been minimized.

Copy link
@jgsogo

jgsogo Sep 9, 2019

Author Member

This test is duplicated in the new ones. It adds no value now.

@jgsogo jgsogo marked this pull request as ready for review Sep 9, 2019
@lasote lasote assigned memsharded and unassigned jgsogo Sep 10, 2019
@jgsogo

This comment has been minimized.

Copy link
Member Author

jgsogo commented Sep 12, 2019

I'll add some checks for CONAN_ERROR_ON_OVERRIDE

@jgsogo

This comment has been minimized.

Copy link
Member Author

jgsogo commented Sep 12, 2019

Checked, no need to add more tests. As long as the message "requirement libB/[<=2.0]@user/channel overridden by your conanfile to libB/1.0@user/channel" is written, the warning will turn into an error with CONAN_ERROR_ON_OVERRIDE=True.

@lasote lasote added this to the 1.20 milestone Sep 25, 2019
@lasote

This comment has been minimized.

Copy link
Contributor

lasote commented Oct 2, 2019

For 1.20. Discuss what we want, if something is breaking etc.

memsharded and others added 2 commits Oct 21, 2019
@memsharded memsharded merged commit 3ee0398 into conan-io:develop Oct 24, 2019
2 checks passed
2 checks passed
continuous-integration/jenkins/pr-head This commit looks good
Details
license/cla Contributor License Agreement is signed.
Details
@jgsogo jgsogo deleted the jgsogo:fix/5507-override-version-ranges branch Oct 24, 2019
@jgsogo jgsogo referenced this pull request Oct 24, 2019
3 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.