Merge branch 'master' into development

2021-03-14 15:06:20 +01:00
parent f77d72fd86 8c751eb532
commit 22c93e2389
13 changed files with 257 additions and 185 deletions
@@ -272,7 +272,8 @@ class Updater(threading.Thread):
                    log.debug("Could not remove: %s", item_path)
        shutil.rmtree(source, ignore_errors=True)

-    def is_venv(self):
+    @staticmethod
+    def is_venv():
        if (hasattr(sys, 'real_prefix')) or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
            return os.sep + os.path.relpath(sys.prefix, constants.BASE_DIR)
        else: