diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index d7f4557b81..f8fc6e900b 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -44,8 +44,9 @@ on: - '[1-9].[0-9]' - '[1-9].[0-9][0-9]' tags: - - '[1-9].[0-9].[0-9]+' - - '[1-9].[0-9][0-9].[0-9]+' + - '[1-9].[0-9].[0-9]*' + - '[1-9].[0-9].[0-9]' + - '[1-9].[0-9][0-9].[0-9]*' jobs: conan-recipe-version: diff --git a/conandata.yml b/conandata.yml index e3dc2eb1c8..377224053c 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,15 +10,226 @@ # requirements (use the /(latest)@ultimaker/testing) # # Subject to change in the future! -"5.2.0-beta": +"5.3.0-alpha": requirements: - - "pyarcus/(latest)@_/_" - - "curaengine/(latest)" - - "pysavitar/(latest)@_/_" - - "pynest2d/(latest)@_/_" - - "uranium/(latest)@_/_" - - "fdm_materials/(latest)@_/_" - - "cura_binary_data/(latest)@_/_" + - "pyarcus/(latest)@ultimaker/testing" + - "curaengine/(latest)@ultimaker/testing" + - "pysavitar/(latest)@ultimaker/testing" + - "pynest2d/(latest)@ultimaker/testing" + - "uranium/(latest)@ultimaker/testing" + - "fdm_materials/(latest)@ultimaker/testing" + - "cura_binary_data/(latest)@ultimaker/testing" + - "cpython/3.10.4" + internal_requirements: + - "fdm_materials_private/(latest)@ultimaker/testing" + - "cura_private_data/(latest)@ultimaker/testing" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + cura_private_data: + package: "cura_private_data" + src: "resources" + dst: "share/cura/resources" + internal: true + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "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: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + fdm_materials_private: + package: "fdm_materials_private" + src: "resources/materials" + dst: "share/cura/resources/materials" + internal: true + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" +"5.2.0-beta.2": + requirements: + - "pyarcus/(latest)@ultimaker/stable" + - "curaengine/(latest)@ultimaker/stable" + - "pysavitar/(latest)@ultimaker/stable" + - "pynest2d/(latest)@ultimaker/stable" + - "uranium/(latest)@ultimaker/stable" + - "fdm_materials/(latest)@ultimaker/stable" + - "cura_binary_data/(latest)@ultimaker/stable" + - "cpython/3.10.4" + internal_requirements: + - "fdm_materials_private/(latest)@ultimaker/testing" + - "cura_private_data/(latest)@ultimaker/testing" + runinfo: + entrypoint: "cura_app.py" + pyinstaller: + datas: + cura_plugins: + package: "cura" + src: "plugins" + dst: "share/cura/plugins" + cura_resources: + package: "cura" + src: "resources" + dst: "share/cura/resources" + cura_private_data: + package: "cura_private_data" + src: "resources" + dst: "share/cura/resources" + internal: true + uranium_plugins: + package: "uranium" + src: "plugins" + dst: "share/uranium/plugins" + uranium_resources: + package: "uranium" + src: "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: "resources/cura/resources" + dst: "share/cura/resources" + uranium_binary_data: + package: "cura_binary_data" + src: "resources/uranium/resources" + dst: "share/uranium/resources" + windows_binary_data: + package: "cura_binary_data" + src: "windows" + dst: "share/windows" + fdm_materials: + package: "fdm_materials" + src: "materials" + dst: "share/cura/resources/materials" + fdm_materials_private: + package: "fdm_materials_private" + src: "resources/materials" + dst: "share/cura/resources/materials" + internal: true + tcl: + package: "tcl" + src: "lib/tcl8.6" + dst: "tcl" + tk: + package: "tk" + src: "lib/tk8.6" + dst: "tk" + binaries: + curaengine: + package: "curaengine" + src: "bin" + dst: "." + binary: "CuraEngine" + hiddenimports: + - "pySavitar" + - "pyArcus" + - "pynest2d" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "logging.handlers" + - "zeroconf" + - "fcntl" + - "stl" + - "serial" + collect_all: + - "cura" + - "UM" + - "serial" + - "Charon" + - "sqlite3" + - "trimesh" + - "win32ctypes" + - "PyQt6" + - "PyQt6.QtNetwork" + - "PyQt6.sip" + - "stl" + icon: + Windows: "./icons/Cura.ico" + Macos: "./icons/cura.icns" + Linux: "./icons/cura-128.png" + +"5.2.0-beta.1": + requirements: + - "pyarcus/5.2.0-beta.1" + - "curaengine/5.2.0-beta.1" + - "pysavitar/5.2.0-beta.1" + - "pynest2d/5.2.0-beta.1" + - "uranium/5.2.0-beta.1" + - "fdm_materials/5.2.0-beta.1" + - "cura_binary_data/5.2.0-beta.1" - "cpython/3.10.4" internal_requirements: - "fdm_materials_private/(latest)@ultimaker/testing" @@ -125,16 +336,15 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" - "5.2.0": requirements: - - "pyarcus/5.1.1-alpha+32@ultimaker/stable" - - "curaengine/(latest)" - - "pysavitar/(latest)@_/_" - - "pynest2d/(latest)@_/_" - - "uranium/(latest)@_/_" - - "fdm_materials/(latest)@_/_" - - "cura_binary_data/(latest)@_/_" + - "pyarcus/5.2.0" + - "curaengine/5.2.0" + - "pysavitar/5.2.0" + - "pynest2d/5.2.0" + - "uranium/5.2.0" + - "fdm_materials/5.2.0" + - "cura_binary_data/5.2.0" - "cpython/3.10.4" internal_requirements: - "fdm_materials_private/(latest)@ultimaker/testing" @@ -231,7 +441,6 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" - "5.2.0-alpha": requirements: - "pyarcus/5.2@ultimaker/testing" diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 49751e1a2a..aa63eb6d2e 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -230,11 +230,11 @@ class UFPWriter(MeshWriter): # Add global user or quality changes global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) for setting in global_flattened_changes.getAllKeys(): - settings["global"]["changes"][setting] = global_flattened_changes.getProperty(setting, "value") + settings["global"]["changes"][setting] = str(global_flattened_changes.getProperty(setting, "value")) # Get global all settings values without user or quality changes for setting in global_stack.getAllKeys(): - settings["global"]["all_settings"][setting] = global_stack.getProperty(setting, "value") + settings["global"]["all_settings"][setting] = str(global_stack.getProperty(setting, "value")) for i, extruder in enumerate(global_stack.extruderList): # Add extruder fields to settings dictionary @@ -246,10 +246,10 @@ class UFPWriter(MeshWriter): # Add extruder user or quality changes extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) for setting in extruder_flattened_changes.getAllKeys(): - settings[f"extruder_{i}"]["changes"][setting] = extruder_flattened_changes.getProperty(setting, "value") + settings[f"extruder_{i}"]["changes"][setting] = str(extruder_flattened_changes.getProperty(setting, "value")) # Get extruder all settings values without user or quality changes for setting in extruder.getAllKeys(): - settings[f"extruder_{i}"]["all_settings"][setting] = extruder.getProperty(setting, "value") + settings[f"extruder_{i}"]["all_settings"][setting] = str(extruder.getProperty(setting, "value")) return settings diff --git a/scripts/rename_cura_1_tags.sh b/scripts/rename_cura_1_tags.sh old mode 100644 new mode 100755 index 8391ed08c2..624bd28d82 --- a/scripts/rename_cura_1_tags.sh +++ b/scripts/rename_cura_1_tags.sh @@ -11,4 +11,4 @@ do git tag -d $i; #Delete old tag. git push origin 1.$i :$i #Rename the tag remotely too. fi -done \ No newline at end of file +done