From d9ea9253b9a248ab2aae72859470226ad2938bf4 Mon Sep 17 00:00:00 2001 From: Moutonjr Geoff Date: Mon, 4 Nov 2019 23:09:03 +0100 Subject: [PATCH 1/2] Adding apps.json new repository paradigm on linter since YunoHost 3.6 release (https://forum.yunohost.org/t/yunohost-3-6-release-sortie-de-yunohost-3-6/8359), apps.json is the standard repo for packaging Apps, making YEP1.2 obsolete. The code has been changed but other documentation and misc must be updated as well, consider this PR as collaborative. --- package_linter.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package_linter.py b/package_linter.py index 284a440..cc7e488 100755 --- a/package_linter.py +++ b/package_linter.py @@ -285,12 +285,10 @@ class App(): # YEP 1.2 Put the app in a weel known repo if "id" in manifest: - official_list_url = "https://raw.githubusercontent.com/YunoHost/apps/master/official.json" - official_list = json.loads(urlopen(official_list_url)['content']) - community_list_url = "https://raw.githubusercontent.com/YunoHost/apps/master/community.json" - community_list = json.loads(urlopen(community_list_url)['content']) - if manifest["id"] not in official_list and manifest["id"] not in community_list: - print_warning("[YEP-1.2] This app is not registered in official or community applications") + app_list_url = "https://raw.githubusercontent.com/YunoHost/apps/master/apps.json" + app_list = json.loads(urlopen(app_list_url)['content']) + if manifest["id"] not in app_list: + print_warning("[YEP-1.2] This app is not registered in official applications") # YEP 1.3 License def license_mentionned_in_readme(path): From 4a1a8ef0f21df22ef98529a2e489b5c0716d4af7 Mon Sep 17 00:00:00 2001 From: moutonjr Date: Tue, 5 Nov 2019 11:00:47 +0100 Subject: [PATCH 2/2] Update package_linter.py Avoid misunderstandings with error message Co-Authored-By: Kayou --- package_linter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_linter.py b/package_linter.py index cc7e488..4360aed 100755 --- a/package_linter.py +++ b/package_linter.py @@ -288,7 +288,7 @@ class App(): app_list_url = "https://raw.githubusercontent.com/YunoHost/apps/master/apps.json" app_list = json.loads(urlopen(app_list_url)['content']) if manifest["id"] not in app_list: - print_warning("[YEP-1.2] This app is not registered in official applications") + print_warning("[YEP-1.2] This app is not registered in our applications list") # YEP 1.3 License def license_mentionned_in_readme(path):