use umbase 0.1.1 or higher

Contributes to CURA-9365

conandata.yml

@@ -1,5 +1,5 @@
-requirements:
-    "None":
+"None":
+    requirements:
         - "arcus/(latest)@ultimaker/stable"
         - "curaengine/(latest)@ultimaker/stable"
         - "savitar/(latest)@ultimaker/stable"
@@ -12,56 +12,9 @@ requirements:
         - "mpdecimal/2.5.1"
         - "tcl/8.6.10"
         - "tk/8.6.10"
-    "5.1.0":
-        - "arcus/5.1.0"
-        - "curaengine/5.1.0"
-        - "savitar/5.1.0"
-        - "pynest2d/5.1.0"
-        - "uranium/5.1.0"
-        - "fdm_materials/5.1.0"
-        - "cura_binary_data/5.1.0"
-        - "cpython/3.10.4"
-        - "libffi/3.2.1"
-        - "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"
-        - "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"
-        - "cpython/3.10.4"
-        - "libffi/3.2.1"
-        - "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"
-        - "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"
-        - "cpython/3.10.4"
-        - "libffi/3.2.1"
-        - "mpdecimal/2.5.1"
-        - "tcl/8.6.10"
-        - "tk/8.6.10"
-runinfo:
-    "None":
-        entrypoint: "cura_app.py"
-    "5.1.0-beta":
-        entrypoint: "cura_app.py"
-    "5.1.0":
-        entrypoint: "cura_app.py"
-    "5.1.0-cura_9365":
+    runinfo:
         entrypoint: "cura_app.py"
-pyinstaller:
-    "None":
+    pyinstaller:
         datas:
             cura_plugins:
                 root: "."
@@ -121,7 +74,23 @@ pyinstaller:
             Windows: "./icons/Cura.ico"
             Macos: "./icons/cura.icns"
             Linux: "./icons/cura-128.png"
-    "5.1.0":
+"5.1.0":
+    requirements:
+        - "arcus/5.1.0"
+        - "curaengine/5.1.0"
+        - "savitar/5.1.0"
+        - "pynest2d/5.1.0"
+        - "uranium/5.1.0"
+        - "fdm_materials/5.1.0"
+        - "cura_binary_data/5.1.0"
+        - "cpython/3.10.4"
+        - "libffi/3.2.1"
+        - "mpdecimal/2.5.1"
+        - "tcl/8.6.10"
+        - "tk/8.6.10"
+    runinfo:
+        entrypoint: "cura_app.py"
+    pyinstaller:
         datas:
             cura_plugins:
                 root: "."
@@ -181,7 +150,23 @@ pyinstaller:
             Windows: "./icons/Cura.ico"
             Macos: "./icons/cura.icns"
             Linux: "./icons/cura-128.png"
-    "5.1.0-beta":
+"5.1.0-beta":
+    requirements:
+        - "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"
+        - "cpython/3.10.4"
+        - "libffi/3.2.1"
+        - "mpdecimal/2.5.1"
+        - "tcl/8.6.10"
+        - "tk/8.6.10"
+    runinfo:
+        entrypoint: "cura_app.py"
+    pyinstaller:
         datas:
             cura_plugins:
                 root: "."
@@ -241,7 +226,23 @@ pyinstaller:
             Windows: "./icons/Cura.ico"
             Macos: "./icons/cura.icns"
             Linux: "./icons/cura-128.png"
-    "5.1.0-cura_9365":
+"5.1.0-alpha":
+    requirements:
+        - "arcus/[5.1.0-alpha.1]@ultimaker/cura_9365"
+        - "curaengine/[5.1.0-alpha.1]@ultimaker/cura_9365"
+        - "savitar/[5.1.0-alpha.1]@ultimaker/cura_9365"
+        - "pynest2d/[5.1.0-alpha.1]@ultimaker/cura_9365"
+        - "uranium/[5.1.0-alpha.1]@ultimaker/cura_9365"
+        - "fdm_materials/5.1.0-beta+12@ultimaker/stable"
+        - "cura_binary_data/5.1.0-alpha.1+25@ultimaker/stable"
+        - "cpython/3.10.4"
+        - "libffi/3.2.1"
+        - "mpdecimal/2.5.1"
+        - "tcl/8.6.10"
+        - "tk/8.6.10"
+    runinfo:
+        entrypoint: "cura_app.py"
+    pyinstaller:
         datas:
             cura_plugins:
                 root: "."

conanfile.py

@@ -27,7 +27,7 @@ class CuraConan(ConanFile):
 
     # FIXME: Remove specific branch once merged to main
     # Extending the conanfile with the UMBaseConanfile https://github.com/Ultimaker/conan-ultimaker-index/tree/CURA-9177_Fix_CI_CD/recipes/umbase
-    python_requires = "umbase/0.1@ultimaker/testing"
+    python_requires = "umbase/[>=0.1.1]@ultimaker/testing"
     python_requires_extend = "umbase.UMBaseConanfile"
 
     options = {