From 0fb8d62825b5fe3f59b7823d4adc4509bbf33e8e Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Sun, 19 Jun 2022 14:59:36 +0200 Subject: Use patched recipes for cpython, mpdecimal, tk, tcl Once upstream recipes are fixed these can be removed again. export the changes for now ``` # Export patched conan-center-index recipes, I will open PR's for all of those git clone https://github.com/jellespijker/conan-center-index.git pushd . cd conan-center-index git checkout fix_tcl_recipe_env_info conan export recipes/tcl/all tcl/8.6.10@ultimaker/testing git checkout fix_tk_recipe_env_info conan export recipes/tk/all tk/8.6.10@ultimaker/testing git checkout fix_mpdecimale_recipe_not_use_msys conan export recipes/mpdecimal/2.5.x mpdecimal/2.5.1@ultimaker/testing git checkout add_3_10_4_version_cpython conan export recipes/cpython/all cpython/3.10.4@ultimaker/testing ``` Contributes to CURA-9365 --- conandata.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'conandata.yml') diff --git a/conandata.yml b/conandata.yml index c23a214170..0aa59b84f2 100644 --- a/conandata.yml +++ b/conandata.yml @@ -7,7 +7,10 @@ requirements: - "uranium/(latest)@ultimaker/stable" - "fdm_materials/(latest)@ultimaker/stable" - "cura_binary_data/(latest)@ultimaker/stable" - - "cpython/3.10.4" + - "cpython/3.10.4@ultimaker/testing" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" "5.1.0": - "arcus/5.1.0" - "curaengine/5.1.0" @@ -16,7 +19,10 @@ requirements: - "uranium/5.1.0" - "fdm_materials/5.1.0" - "cura_binary_data/5.1.0" - - "cpython/3.10.4" + - "cpython/3.10.4@ultimaker/testing" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" "5.1.0-beta": - "arcus/[5.1.0-beta]@ultimaker/stable" - "curaengine/[5.1.0-beta]@ultimaker/stable" @@ -25,7 +31,10 @@ requirements: - "uranium/[5.1.0-beta]@ultimaker/stable" - "fdm_materials/[5.1.0-beta]@ultimaker/stable" - "cura_binary_data/[5.1.0-beta]@ultimaker/stable" - - "cpython/3.10.4" + - "cpython/3.10.4@ultimaker/testing" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" "5.1.0-cura_9365": - "arcus/[5.1.0-cura_9365]@ultimaker/testing" - "curaengine/[5.1.0-cura_9365]@ultimaker/testing" @@ -34,7 +43,10 @@ requirements: - "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" - - "cpython/3.10.4" + - "cpython/3.10.4@ultimaker/testing" + - "mpdecimal/2.5.1@ultimaker/testing" + - "tcl/8.6.10@ultimaker/testing" + - "tk/8.6.10@ultimaker/testing" runinfo: "None": entrypoint: "cura_app.py" -- cgit v1.2.3