From 2c5c28bbe249aebb89b8a3e45c8a1f8c9aa6fd68 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 3 Aug 2022 15:53:21 +0530 Subject: [PATCH 1/3] fix: Remove broken import path --- bench/utils/bench.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/bench/utils/bench.py b/bench/utils/bench.py index cf590e6f1..b6afd1c08 100644 --- a/bench/utils/bench.py +++ b/bench/utils/bench.py @@ -385,7 +385,6 @@ def update( from bench.bench import Bench from bench.config.common_site_config import update_config from bench.exceptions import CannotUpdateReleaseBench - from bench.utils import clear_command_cache from bench.utils.app import is_version_upgrade from bench.utils.system import backup_all_sites @@ -394,8 +393,6 @@ def update( patches.run(bench_path=bench_path) conf = bench.conf - clear_command_cache(bench_path=".") - if conf.get("release_bench"): raise CannotUpdateReleaseBench("Release bench detected, cannot update!") From 4014f7349dde39ec743cab66acb9f55257c5dec8 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 3 Aug 2022 16:04:21 +0530 Subject: [PATCH 2/3] refactor: Exceptions, variables with pylint --- bench/patches/v5/fix_user_permissions.py | 1 + bench/utils/__init__.py | 9 +++++---- bench/utils/bench.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bench/patches/v5/fix_user_permissions.py b/bench/patches/v5/fix_user_permissions.py index c780bbc01..917d5486f 100644 --- a/bench/patches/v5/fix_user_permissions.py +++ b/bench/patches/v5/fix_user_permissions.py @@ -13,6 +13,7 @@ def is_sudoers_set(): """Check if bench sudoers is set""" cmd = ["sudo", "-n", "bench"] + bench_warn = False with open(os.devnull, "wb") as f: return_code_check = not subprocess.call(cmd, stdout=f) diff --git a/bench/utils/__init__.py b/bench/utils/__init__.py index 35f1bd79a..a25e92204 100644 --- a/bench/utils/__init__.py +++ b/bench/utils/__init__.py @@ -63,9 +63,10 @@ def is_valid_frappe_branch(frappe_path: str, frappe_branch: str): :type frappe_branch: str :raises InvalidRemoteException: branch for this repo doesn't exist """ - import git + from git.cmd import Git + from git.exc import GitCommandError - g = git.cmd.Git() + g = Git() if frappe_branch: try: @@ -74,8 +75,8 @@ def is_valid_frappe_branch(frappe_path: str, frappe_branch: str): raise InvalidRemoteException( f"Invalid branch or tag: {frappe_branch} for the remote {frappe_path}" ) - except git.exc.GitCommandError: - raise InvalidRemoteException(f"Invalid frappe path: {frappe_path}") + except GitCommandError as e: + raise InvalidRemoteException(f"Invalid frappe path: {frappe_path}") from e def log(message, level=0, no_log=False): diff --git a/bench/utils/bench.py b/bench/utils/bench.py index b6afd1c08..5467256a7 100644 --- a/bench/utils/bench.py +++ b/bench/utils/bench.py @@ -280,7 +280,7 @@ def restart_supervisor_processes(bench_path=".", web_workers=False): sudo = "" try: supervisor_status = get_cmd_output("supervisorctl status", cwd=bench_path) - except Exception as e: + except subprocess.CalledProcessError as e: if e.returncode == 127: log("restart failed: Couldn't find supervisorctl in PATH", level=3) return From 7e12108bc6c52b2b0fa4e470d32689f223b6ed51 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 3 Aug 2022 16:16:30 +0530 Subject: [PATCH 3/3] ci: automated release regex ref: https://github.com/frappe/frappe/pull/17725 --- .releaserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 3d33a1da2..34acc50ac 100644 --- a/.releaserc +++ b/.releaserc @@ -5,7 +5,7 @@ "@semantic-release/release-notes-generator", [ "@semantic-release/exec", { - "prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" bench/__init__.py' + "prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" bench/__init__.py' } ], [