From 355ad3b284f7385055461cf42f915ac35883b1ca Mon Sep 17 00:00:00 2001 From: Tasko Olevski Date: Tue, 17 Oct 2023 17:51:16 +0200 Subject: [PATCH] squashme: fix tests --- renku/core/util/git.py | 2 +- renku/ui/service/cache/models/project.py | 1 - renku/ui/service/cache/serializers/project.py | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/renku/core/util/git.py b/renku/core/util/git.py index 43a1b4e88d..348d87e9b6 100644 --- a/renku/core/util/git.py +++ b/renku/core/util/git.py @@ -823,7 +823,7 @@ def clone(branch, depth): try: # NOTE: Try to clone, assuming checkout_revision is a branch or a tag (if it is set) repository = clone(branch=checkout_revision, depth=depth) - except errors.GitCommandError as err: + except errors.GitCommandError: if not checkout_revision: if raise_git_except: raise diff --git a/renku/ui/service/cache/models/project.py b/renku/ui/service/cache/models/project.py index f0680bf841..b26b5d7815 100644 --- a/renku/ui/service/cache/models/project.py +++ b/renku/ui/service/cache/models/project.py @@ -26,7 +26,6 @@ from renku.ui.service.cache.base import BaseCache from renku.ui.service.config import CACHE_PROJECTS_PATH -from renku.ui.service.utils import normalize_git_url MAX_CONCURRENT_PROJECT_REQUESTS = 10 LOCK_TIMEOUT = 15 diff --git a/renku/ui/service/cache/serializers/project.py b/renku/ui/service/cache/serializers/project.py index 199f48fb11..d9e484ebc6 100644 --- a/renku/ui/service/cache/serializers/project.py +++ b/renku/ui/service/cache/serializers/project.py @@ -45,7 +45,8 @@ class ProjectSchema(CreationSchema, AccessSchema, MandatoryUserSchema): @post_load def make_project(self, data, **options): """Construct project object.""" - data["git_url"] = normalize_git_url(data["git_url"]) + if data.get("git_url"): + data["git_url"] = normalize_git_url(data["git_url"]) data["name"] = normalize_git_url(data["name"]) data["slug"] = normalize_git_url(data["slug"]) return Project(**data)