From 589f7a400e5b613294a203e3c781be05ba5d73bb Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Sun, 28 Aug 2022 13:36:06 +0200 Subject: [PATCH 1/3] fix: bad URL in raw.githubusercontent.com (#1363) --- bench/utils/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bench/utils/app.py b/bench/utils/app.py index 84b6df18..d313fae1 100644 --- a/bench/utils/app.py +++ b/bench/utils/app.py @@ -185,7 +185,7 @@ def get_required_deps(org, name, branch, deps="hooks.py"): res = requests.get(url=git_api_url, params=params).json() if "message" in res: - git_url = f"https://raw.githubusercontent.com/{org}/{name}/{params['branch']}/{deps}" + git_url = f"https://raw.githubusercontent.com/{org}/{name}/{params['branch']}/{name}/{deps}" return requests.get(git_url).text return base64.decodebytes(res["content"].encode()).decode() From 9131ba05dbc72c6a482b54219db8adad2adf9158 Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Sun, 28 Aug 2022 14:29:10 +0200 Subject: [PATCH 2/3] fix: use ref param instead of branch for get_required_deps (GitHub contents API) (#1362) * fix: use ref param instead of branch * fix: use ref param instead of branch * chore: unintentional changes from web editor Co-authored-by: Ankush Menat --- bench/utils/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bench/utils/app.py b/bench/utils/app.py index d313fae1..790792da 100644 --- a/bench/utils/app.py +++ b/bench/utils/app.py @@ -181,11 +181,11 @@ def get_required_deps(org, name, branch, deps="hooks.py"): import base64 git_api_url = f"https://api.github.com/repos/{org}/{name}/contents/{name}/{deps}" - params = {"branch": branch or "develop"} + params = {"ref": branch or "develop"} res = requests.get(url=git_api_url, params=params).json() if "message" in res: - git_url = f"https://raw.githubusercontent.com/{org}/{name}/{params['branch']}/{name}/{deps}" + git_url = f"https://raw.githubusercontent.com/{org}/{name}/{params['ref']}/{name}/{deps}" return requests.get(git_url).text return base64.decodebytes(res["content"].encode()).decode() From 4bc3a086f2f433b99afb40bffab92f9c1de63ba6 Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Sun, 28 Aug 2022 18:47:00 +0530 Subject: [PATCH 3/3] fix: parsing error (#1364) --- bench/config/templates/frappe_sudoers | 1 + 1 file changed, 1 insertion(+) diff --git a/bench/config/templates/frappe_sudoers b/bench/config/templates/frappe_sudoers index c0857408..aacd913f 100644 --- a/bench/config/templates/frappe_sudoers +++ b/bench/config/templates/frappe_sudoers @@ -17,3 +17,4 @@ {{ user }} ALL = (root) NOPASSWD: {{ certbot }} Defaults:{{ user }} !requiretty +