Merge branch 'main' into 5.5

Ultimaker · Oct 10, 2023 · 9430dee · 9430dee
2 parents 2e2aa13 + c85203f
commit 9430dee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/UM/Settings/ContainerRegistry.py b/UM/Settings/ContainerRegistry.py
@@ -866,13 +866,11 @@ def _onContainerMetaDataChanged(self, *args: ContainerInterface, **kwargs: Any)
     def _isMetadataValid(self, metadata: Optional[metadata_type]) -> bool:
         """Validate a metadata object.
 
-        If the metadata is invalid, the container is not allowed to be in the
-        registry.
+        If the metadata is invalid, the container is not allowed to be in the registry.
         :param metadata: A metadata object.
         :return: Whether this metadata was valid.
         """
-
-        return metadata is not None
+        return metadata is not None and "type" in metadata and "name" in metadata
 
     def getLockFilename(self) -> str:
         """Get the lock filename including full path

diff --git a/conanfile.py b/conanfile.py
@@ -34,7 +34,7 @@ class UraniumConan(ConanFile):
 
     def set_version(self):
         if not self.version:
-            self.version = "5.5.0-beta.2"
+            self.version = "5.6.0-alpha"
 
     @property
     def _base_dir(self):