From 1f611994028067ae7f0b0e5d2d70faf1404f0317 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 8 Mar 2024 15:34:48 +0100 Subject: [PATCH 1/6] Pin package and requirements versions --- conandata.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/conandata.yml b/conandata.yml index fdfc2dec11..574a4fdc2f 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,17 @@ -version: "5.7.0-alpha.1" +version: "5.7.0-beta.1" requirements: - - "uranium/(latest)@ultimaker/testing" - - "curaengine/(latest)@ultimaker/testing" - - "cura_binary_data/(latest)@ultimaker/testing" - - "fdm_materials/(latest)@ultimaker/testing" - - "curaengine_plugin_gradual_flow/0.1.0-beta.3" - - "dulcificum/latest@ultimaker/testing" - - "pysavitar/5.3.0" - - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/(latest)@ultimaker/testing" + - "uranium/5.7.0-beta.1" + - "curaengine/5.7.0-beta.1" + - "cura_binary_data/5.7.0-beta.1" + - "fdm_materials/5.7.0-beta.1" + - "curaengine_plugin_gradual_flow/0.1.0" + - "dulcificum/0.2.0" + - "pysavitar/5.4.0" + - "pynest2d/5.4.0" + - "curaengine_grpc_definitions/0.2.0" requirements_internal: - - "fdm_materials/(latest)@internal/testing" - - "cura_private_data/(latest)@internal/testing" + - "fdm_materials/5.7.0-beta.1" + - "cura_private_data/5.7.0-beta.1" urls: default: cloud_api_root: "https://api.ultimaker.com" From 7b45fd936802c248caa994d5b003f92657859ce3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 8 Mar 2024 15:39:41 +0100 Subject: [PATCH 2/6] Pin pysavitar and pynest2d to the stable versions --- conandata.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 574a4fdc2f..bff4f1117d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -6,8 +6,8 @@ requirements: - "fdm_materials/5.7.0-beta.1" - "curaengine_plugin_gradual_flow/0.1.0" - "dulcificum/0.2.0" - - "pysavitar/5.4.0" - - "pynest2d/5.4.0" + - "pysavitar/5.3.0" + - "pynest2d/5.3.0" - "curaengine_grpc_definitions/0.2.0" requirements_internal: - "fdm_materials/5.7.0-beta.1" From f5d1256125e00000e8d3bdbd578b4efb47e9df51 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 8 Mar 2024 16:20:27 +0100 Subject: [PATCH 3/6] Use latest packages versions --- conandata.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conandata.yml b/conandata.yml index bff4f1117d..34ab722354 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,17 +1,17 @@ version: "5.7.0-beta.1" requirements: - - "uranium/5.7.0-beta.1" - - "curaengine/5.7.0-beta.1" - - "cura_binary_data/5.7.0-beta.1" - - "fdm_materials/5.7.0-beta.1" - - "curaengine_plugin_gradual_flow/0.1.0" - - "dulcificum/0.2.0" + - "uranium/(latest)@ultimaker/stable" + - "curaengine/(latest)@ultimaker/stable" + - "cura_binary_data/(latest)@ultimaker/stable" + - "fdm_materials/(latest)@ultimaker/stable" + - "curaengine_plugin_gradual_flow/0.1.0-beta.3@ultimaker/stable" + - "dulcificum/latest@ultimaker/stable" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/0.2.0" + - "curaengine_grpc_definitions/(latest)@ultimaker/stable" requirements_internal: - - "fdm_materials/5.7.0-beta.1" - - "cura_private_data/5.7.0-beta.1" + - "fdm_materials/(latest)@internal/stable" + - "cura_private_data/(latest)@internal/stable" urls: default: cloud_api_root: "https://api.ultimaker.com" From f4d8d643e0b495f3ad036a40e8adf02692f9bb4d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 11 Mar 2024 08:18:07 +0100 Subject: [PATCH 4/6] Set correct beta version number --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 34ab722354..fe08426fe5 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,4 +1,4 @@ -version: "5.7.0-beta.1" +version: "5.7.0-beta.0" requirements: - "uranium/(latest)@ultimaker/stable" - "curaengine/(latest)@ultimaker/stable" From 0520452f46c7dfe6b533a236e7547e760b7df118 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 11 Mar 2024 08:33:51 +0100 Subject: [PATCH 5/6] Use stable channel only for packages with release branch --- conandata.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conandata.yml b/conandata.yml index fe08426fe5..23b4e6f813 100644 --- a/conandata.yml +++ b/conandata.yml @@ -4,14 +4,14 @@ requirements: - "curaengine/(latest)@ultimaker/stable" - "cura_binary_data/(latest)@ultimaker/stable" - "fdm_materials/(latest)@ultimaker/stable" - - "curaengine_plugin_gradual_flow/0.1.0-beta.3@ultimaker/stable" - - "dulcificum/latest@ultimaker/stable" + - "curaengine_plugin_gradual_flow/0.1.0-beta.3" + - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/(latest)@ultimaker/stable" + - "curaengine_grpc_definitions/(latest)@ultimaker/testing" requirements_internal: - - "fdm_materials/(latest)@internal/stable" - - "cura_private_data/(latest)@internal/stable" + - "fdm_materials/(latest)@internal/testing" + - "cura_private_data/(latest)@internal/testing" urls: default: cloud_api_root: "https://api.ultimaker.com" From 3bfce9f003d092342a33a4ab6bb2040d1797e022 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 11 Mar 2024 08:39:57 +0100 Subject: [PATCH 6/6] Pin grpc_definitions version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 23b4e6f813..0d0452ebbe 100644 --- a/conandata.yml +++ b/conandata.yml @@ -8,7 +8,7 @@ requirements: - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/(latest)@ultimaker/testing" + - "curaengine_grpc_definitions/0.2.0" requirements_internal: - "fdm_materials/(latest)@internal/testing" - "cura_private_data/(latest)@internal/testing"