From 566f6dd74dbdceab9d080d43c6ff946b17d64247 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Mon, 20 Sep 2021 10:36:02 +0300 Subject: [PATCH] Conan: Use recipe revision mode for 'python_requires' By default Conan uses 'minor_mode' policy for 'python_requires' dependencies. This causes updates in 'qt-conan-common' package not to land into users when invoking e.g. "$conan instal .. --update". Fix this by enforcing recipe revision mode so any changes to 'qt-conan-common' recipe is received by the clients when updating packages. Change-Id: I225965aa76c39552bd4adc93d7e68e0ae0b38d56 Reviewed-by: Toni Saario (cherry picked from commit acaf38cfe4e2ef19f7318d5476aa7bee7a487e80) Reviewed-by: Qt Cherry-pick Bot --- conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conanfile.py b/conanfile.py index f58bf92a5a8..4d2af9047aa 100644 --- a/conanfile.py +++ b/conanfile.py @@ -446,6 +446,8 @@ class QtBase(ConanFile): def package_id(self): # https://docs.conan.io/en/latest/creating_packages/define_abi_compatibility.html self.info.requires.package_revision_mode() + # Enable 'qt-conan-common' updates on client side with $conan install .. --update + self.info.python_requires.recipe_revision_mode() # Remove those configure(.bat) options which should not affect package_id. # These point to local file system paths and in order to re-use pre-built