From cd3bb71f6fd0c5f646cdef895a5fffa262521a1e Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 17 Jun 2022 07:19:53 +0200 Subject: [PATCH] Use semver compatible range modifier https://docs.conan.io/en/latest/versioning/version_ranges.html It won't match build metadata otherwise. The order of search for matching versions is as follows: First, the local conan storage is searched for matching versions, unless the --update flag is provided to conan install. If a matching version is found, it is used in the dependency graph as a solution. If no matching version is locally found, it starts to search in the remotes, in order. If some remote is specified with -r=remote, then only that remote will be used. If the --update parameter is used, then the existing packages in the local conan cache will not be used, and the same search of the previous steps is carried out in the remotes. If new matching versions are found, they will be retrieved, so subsequent calls to install will find them locally and use them. Contributes to CURA-9365 --- conandata.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/conandata.yml b/conandata.yml index bd3e211889..c4c6ac0037 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,20 +1,20 @@ requirements: "5.1.0-beta": - - "arcus/5.1.0-beta@ultimaker/stable" - - "curaengine/5.1.0-beta@ultimaker/stable" - - "savitar/5.1.0-beta@ultimaker/stable" - - "pynest2d/5.1.0-beta@ultimaker/stable" - - "uranium/5.1.0-beta@ultimaker/stable" - - "fdm_materials/5.1.0-beta@ultimaker/stable" - - "cura_binary_data/5.1.0-beta@ultimaker/stable" + - "arcus/[~5.1.0-beta]@ultimaker/stable" + - "curaengine/[~5.1.0-beta]@ultimaker/stable" + - "savitar/[~5.1.0-beta]@ultimaker/stable" + - "pynest2d/[~5.1.0-beta]@ultimaker/stable" + - "uranium/[~5.1.0-beta]@ultimaker/stable" + - "fdm_materials/[~5.1.0-beta]@ultimaker/stable" + - "cura_binary_data/[~5.1.0-beta]@ultimaker/stable" "5.1.0-cura_9365": - - "arcus/5.1.0-cura_9365@ultimaker/testing" - - "curaengine/5.1.0-cura_9365@ultimaker/testing" - - "savitar/5.1.0-cura_9365@ultimaker/testing" - - "pynest2d/5.1.0-cura_9365@ultimaker/testing" - - "uranium/5.1.0-cura_9365@ultimaker/testing" - - "fdm_materials/5.1.0-cura_9365@ultimaker/testing" - - "cura_binary_data/5.1.0-cura_9365@ultimaker/testing" + - "arcus/~[5.1.0-cura_9365]@ultimaker/testing" + - "curaengine/[~5.1.0-cura_9365]@ultimaker/testing" + - "savitar/[~5.1.0-cura_9365]@ultimaker/testing" + - "pynest2d/[~5.1.0-cura_9365]@ultimaker/testing" + - "uranium/[~5.1.0-cura_9365]@ultimaker/testing" + - "fdm_materials/[~5.1.0-cura_9365]@ultimaker/testing" + - "cura_binary_data/[~5.1.0-cura_9365]@ultimaker/testing" pyinstaller: "5.1.0-beta": datas: