3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

use umbase 0.1.1 or higher

Browse source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-22 09:28:52 +02:00 • committed by Jelle Spijker
parent 6ca96814a8
commit ee87a2e3a4
2 changed files with 204 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

405
conandata.yml
View file

@ -1,5 +1,5 @@
requirements: "None":
"None": requirements:
- "arcus/(latest)@ultimaker/stable" - "arcus/(latest)@ultimaker/stable"
- "curaengine/(latest)@ultimaker/stable" - "curaengine/(latest)@ultimaker/stable"
- "savitar/(latest)@ultimaker/stable" - "savitar/(latest)@ultimaker/stable"
@ -12,7 +12,70 @@ requirements:
- "mpdecimal/2.5.1" - "mpdecimal/2.5.1"
- "tcl/8.6.10" - "tcl/8.6.10"
- "tk/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" - "arcus/5.1.0"
- "curaengine/5.1.0" - "curaengine/5.1.0"
- "savitar/5.1.0" - "savitar/5.1.0"
@ -25,7 +88,70 @@ requirements:
- "mpdecimal/2.5.1" - "mpdecimal/2.5.1"
- "tcl/8.6.10" - "tcl/8.6.10"
- "tk/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" - "arcus/[5.1.0-beta]@ultimaker/stable"
- "curaengine/[5.1.0-beta]@ultimaker/stable" - "curaengine/[5.1.0-beta]@ultimaker/stable"
- "savitar/[5.1.0-beta]@ultimaker/stable" - "savitar/[5.1.0-beta]@ultimaker/stable"
@ -38,210 +164,85 @@ requirements:
- "mpdecimal/2.5.1" - "mpdecimal/2.5.1"
- "tcl/8.6.10" - "tcl/8.6.10"
- "tk/8.6.10" - "tk/8.6.10"
"5.1.0-cura_9365": runinfo:
- "arcus/[5.1.0-cura_9365]@ultimaker/testing" entrypoint: "cura_app.py"
- "curaengine/[5.1.0-cura_9365]@ultimaker/testing" pyinstaller:
- "savitar/[5.1.0-cura_9365]@ultimaker/testing" datas:
- "pynest2d/[5.1.0-cura_9365]@ultimaker/testing" cura_plugins:
- "uranium/[5.1.0-cura_9365]@ultimaker/testing" root: "."
- "fdm_materials/[5.1.0-cura_9365]@ultimaker/testing" src: "plugins"
- "cura_binary_data/[5.1.0-cura_9365]@ultimaker/testing" 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" - "cpython/3.10.4"
- "libffi/3.2.1" - "libffi/3.2.1"
- "mpdecimal/2.5.1" - "mpdecimal/2.5.1"
- "tcl/8.6.10" - "tcl/8.6.10"
- "tk/8.6.10" - "tk/8.6.10"
runinfo: runinfo:
"None":
entrypoint: "cura_app.py" entrypoint: "cura_app.py"
"5.1.0-beta": pyinstaller:
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":
datas: datas:
cura_plugins: cura_plugins:
root: "." root: "."

2
conanfile.py
View file

@ -27,7 +27,7 @@ class CuraConan(ConanFile):
# FIXME: Remove specific branch once merged to main # 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 # 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" python_requires_extend = "umbase.UMBaseConanfile"
options = { options = {