diff --git a/conandata.yml b/conandata.yml index 544d83e1b0..9ad7e9edae 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,5 +1,5 @@ -requirements: - "None": +"None": + requirements: - "arcus/(latest)@ultimaker/stable" - "curaengine/(latest)@ultimaker/stable" - "savitar/(latest)@ultimaker/stable" @@ -12,7 +12,70 @@ requirements: - "mpdecimal/2.5.1" - "tcl/8.6.10" - "tk/8.6.10" - "5.1.0": + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + root: "." + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + root: "." + src: "resources" + dst: "share/cura/resources" + uranium_plugins: + package: "uranium" + src: "site-packages/plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "res/resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "res/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "res/uranium/resources" + dst: "share/uranium/resources" + fdm_materials: + package: "fdm_materials" + src: "res/materials" + dst: "share/cura/resources/materials" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6.QtNetwork" + - "logging.handlers" + - "zeroconf" + - "fcntl" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" +"5.1.0": + requirements: - "arcus/5.1.0" - "curaengine/5.1.0" - "savitar/5.1.0" @@ -25,7 +88,70 @@ requirements: - "mpdecimal/2.5.1" - "tcl/8.6.10" - "tk/8.6.10" - "5.1.0-beta": + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + root: "." + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + root: "." + src: "resources" + dst: "share/cura/resources" + uranium_plugins: + package: "uranium" + src: "site-packages/plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "res/resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "res/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "res/uranium/resources" + dst: "share/uranium/resources" + fdm_materials: + package: "fdm_materials" + src: "res/materials" + dst: "share/cura/resources/materials" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6.QtNetwork" + - "logging.handlers" + - "zeroconf" + - "fcntl" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" +"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" @@ -38,210 +164,85 @@ requirements: - "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" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + root: "." + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + root: "." + src: "resources" + dst: "share/cura/resources" + uranium_plugins: + package: "uranium" + src: "site-packages/plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "res/resources" + dst: "share/uranium/resources" + uranium_um_qt_qml_um: + package: "uranium" + src: "site-packages/UM/Qt/qml/UM" + dst: "PyQt6/qt6/qml/UM" + cura_binary_data: + package: "cura_binary_data" + src: "res/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "res/uranium/resources" + dst: "share/uranium/resources" + fdm_materials: + package: "fdm_materials" + src: "res/materials" + dst: "share/cura/resources/materials" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6.QtNetwork" + - "logging.handlers" + - "zeroconf" + - "fcntl" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" +"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: - "None": + runinfo: entrypoint: "cura_app.py" - "5.1.0-beta": - entrypoint: "cura_app.py" - "5.1.0": - entrypoint: "cura_app.py" - "5.1.0-cura_9365": - entrypoint: "cura_app.py" -pyinstaller: - "None": - datas: - cura_plugins: - root: "." - src: "plugins" - dst: "share/cura/plugins" - cura_resources: - root: "." - src: "resources" - dst: "share/cura/resources" - uranium_plugins: - package: "uranium" - src: "site-packages/plugins" - dst: "share/uranium/plugins" - uranium_resources: - package: "uranium" - src: "res/resources" - dst: "share/uranium/resources" - uranium_um_qt_qml_um: - package: "uranium" - src: "site-packages/UM/Qt/qml/UM" - dst: "PyQt6/qt6/qml/UM" - cura_binary_data: - package: "cura_binary_data" - src: "res/cura/resources" - dst: "share/cura/resources" - uranium_binary_data: - package: "cura_binary_data" - src: "res/uranium/resources" - dst: "share/uranium/resources" - fdm_materials: - package: "fdm_materials" - src: "res/materials" - dst: "share/cura/resources/materials" - binaries: - curaengine: - package: "curaengine" - src: "bin" - dst: "." - binary: "CuraEngine" - hiddenimports: - - "pySavitar" - - "pyArcus" - - "pynest2d" - - "PyQt6.QtNetwork" - - "logging.handlers" - - "zeroconf" - - "fcntl" - collect_all: - - "cura" - - "UM" - - "serial" - - "Charon" - - "sqlite3" - - "trimesh" - - "win32ctypes" - icon: - Windows: "./icons/Cura.ico" - Macos: "./icons/cura.icns" - Linux: "./icons/cura-128.png" - "5.1.0": - datas: - cura_plugins: - root: "." - src: "plugins" - dst: "share/cura/plugins" - cura_resources: - root: "." - src: "resources" - dst: "share/cura/resources" - uranium_plugins: - package: "uranium" - src: "site-packages/plugins" - dst: "share/uranium/plugins" - uranium_resources: - package: "uranium" - src: "res/resources" - dst: "share/uranium/resources" - uranium_um_qt_qml_um: - package: "uranium" - src: "site-packages/UM/Qt/qml/UM" - dst: "PyQt6/qt6/qml/UM" - cura_binary_data: - package: "cura_binary_data" - src: "res/cura/resources" - dst: "share/cura/resources" - uranium_binary_data: - package: "cura_binary_data" - src: "res/uranium/resources" - dst: "share/uranium/resources" - fdm_materials: - package: "fdm_materials" - src: "res/materials" - dst: "share/cura/resources/materials" - binaries: - curaengine: - package: "curaengine" - src: "bin" - dst: "." - binary: "CuraEngine" - hiddenimports: - - "pySavitar" - - "pyArcus" - - "pynest2d" - - "PyQt6.QtNetwork" - - "logging.handlers" - - "zeroconf" - - "fcntl" - collect_all: - - "cura" - - "UM" - - "serial" - - "Charon" - - "sqlite3" - - "trimesh" - - "win32ctypes" - icon: - Windows: "./icons/Cura.ico" - Macos: "./icons/cura.icns" - Linux: "./icons/cura-128.png" - "5.1.0-beta": - datas: - cura_plugins: - root: "." - src: "plugins" - dst: "share/cura/plugins" - cura_resources: - root: "." - src: "resources" - dst: "share/cura/resources" - uranium_plugins: - package: "uranium" - src: "site-packages/plugins" - dst: "share/uranium/plugins" - uranium_resources: - package: "uranium" - src: "res/resources" - dst: "share/uranium/resources" - uranium_um_qt_qml_um: - package: "uranium" - src: "site-packages/UM/Qt/qml/UM" - dst: "PyQt6/qt6/qml/UM" - cura_binary_data: - package: "cura_binary_data" - src: "res/cura/resources" - dst: "share/cura/resources" - uranium_binary_data: - package: "cura_binary_data" - src: "res/uranium/resources" - dst: "share/uranium/resources" - fdm_materials: - package: "fdm_materials" - src: "res/materials" - dst: "share/cura/resources/materials" - binaries: - curaengine: - package: "curaengine" - src: "bin" - dst: "." - binary: "CuraEngine" - hiddenimports: - - "pySavitar" - - "pyArcus" - - "pynest2d" - - "PyQt6.QtNetwork" - - "logging.handlers" - - "zeroconf" - - "fcntl" - collect_all: - - "cura" - - "UM" - - "serial" - - "Charon" - - "sqlite3" - - "trimesh" - - "win32ctypes" - icon: - Windows: "./icons/Cura.ico" - Macos: "./icons/cura.icns" - Linux: "./icons/cura-128.png" - "5.1.0-cura_9365": + pyinstaller: datas: cura_plugins: root: "." diff --git a/conanfile.py b/conanfile.py index fc60b9a228..e157cf2e18 100644 --- a/conanfile.py +++ b/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 = {