From d275ad37f8447bf103090a145176ec4570a72a0d Mon Sep 17 00:00:00 2001
From: "j.spijker@ultimaker.com" <jelle spijker>
Date: Tue, 21 Jun 2022 07:52:27 +0200
Subject: [PATCH] Remove user and channel

Even though we had to patch these recipes, the user/channel
shouldn't be necesary any more because of the order in which
our remotes are defined in the conan-config repo. It will
first look into our own remotes, before going over to
conan-center-index.

Once the packages upstream are fixed for us, then we can use
the conan-center-index packages again, without changing the
code.

Contributes to CURA-9365
---
 conandata.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/conandata.yml b/conandata.yml
index d5504caa1c..544d83e1b0 100644
--- a/conandata.yml
+++ b/conandata.yml
@@ -7,11 +7,11 @@ requirements:
         - "uranium/(latest)@ultimaker/stable"
         - "fdm_materials/(latest)@ultimaker/stable"
         - "cura_binary_data/(latest)@ultimaker/stable"
-        - "cpython/3.10.4@ultimaker/testing"
+        - "cpython/3.10.4"
         - "libffi/3.2.1"
-        - "mpdecimal/2.5.1@ultimaker/testing"
-        - "tcl/8.6.10@ultimaker/testing"
-        - "tk/8.6.10@ultimaker/testing"
+        - "mpdecimal/2.5.1"
+        - "tcl/8.6.10"
+        - "tk/8.6.10"
     "5.1.0":
         - "arcus/5.1.0"
         - "curaengine/5.1.0"
@@ -20,11 +20,11 @@ requirements:
         - "uranium/5.1.0"
         - "fdm_materials/5.1.0"
         - "cura_binary_data/5.1.0"
-        - "cpython/3.10.4@ultimaker/testing"
+        - "cpython/3.10.4"
         - "libffi/3.2.1"
-        - "mpdecimal/2.5.1@ultimaker/testing"
-        - "tcl/8.6.10@ultimaker/testing"
-        - "tk/8.6.10@ultimaker/testing"
+        - "mpdecimal/2.5.1"
+        - "tcl/8.6.10"
+        - "tk/8.6.10"
     "5.1.0-beta":
         - "arcus/[5.1.0-beta]@ultimaker/stable"
         - "curaengine/[5.1.0-beta]@ultimaker/stable"
@@ -33,11 +33,11 @@ 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@ultimaker/testing"
+        - "cpython/3.10.4"
         - "libffi/3.2.1"
-        - "mpdecimal/2.5.1@ultimaker/testing"
-        - "tcl/8.6.10@ultimaker/testing"
-        - "tk/8.6.10@ultimaker/testing"
+        - "mpdecimal/2.5.1"
+        - "tcl/8.6.10"
+        - "tk/8.6.10"
     "5.1.0-cura_9365":
         - "arcus/[5.1.0-cura_9365]@ultimaker/testing"
         - "curaengine/[5.1.0-cura_9365]@ultimaker/testing"
@@ -46,11 +46,11 @@ 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@ultimaker/testing"
+        - "cpython/3.10.4"
         - "libffi/3.2.1"
-        - "mpdecimal/2.5.1@ultimaker/testing"
-        - "tcl/8.6.10@ultimaker/testing"
-        - "tk/8.6.10@ultimaker/testing"
+        - "mpdecimal/2.5.1"
+        - "tcl/8.6.10"
+        - "tk/8.6.10"
 runinfo:
     "None":
         entrypoint: "cura_app.py"