Merge branch 'develop' into version2.0.1

viur-framework · May 7, 2024 · 647cfa1 · 647cfa1
2 parents 301581e + 90f1a4f
commit 647cfa1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/viur_cli/conf.py b/src/viur_cli/conf.py
@@ -119,10 +119,15 @@ def migrate(self):
             self.find_key(self, target_key="application_name", target="default", keep=True)
             if "application_name" in self:
                 del self["application_name"]
-
+
+        if "version" not in self["default"]:
+            self.find_key(self, target_key="version", target="default", keep=True)
+            # Fail Safe
+            if "version" in self:
+                del self["version"]
+
         self.remove_key(self, target_key="core")
 
-
         if old_format := self["default"].get("format"):
             self["format"] = old_format
             del self["default"]["format"]

diff --git a/src/viur_cli/update.py b/src/viur_cli/update.py
@@ -100,6 +100,7 @@ def check_req(projects_requirements_path):
 
     if not core_requirements:
         echo_error("could now find core package, please update the core to validate the requirements.txt")
+        return
 
     core_requirements_obj = utils.requirements_to_dict(parse_requirements(core_requirements, session=PipSession()))