From 8f26202ab9be717a275d59aa24026ea27f9c3a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20Dom=C3=ADnguez?= Date: Tue, 20 Dec 2022 08:37:10 +0100 Subject: [PATCH 1/2] Allow local files with EXTENDS --- megalinter/config.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/megalinter/config.py b/megalinter/config.py index 300758947c4..b04609edec9 100644 --- a/megalinter/config.py +++ b/megalinter/config.py @@ -76,11 +76,14 @@ def init_config(workspace=None): if isinstance(extends, str): extends = extends.split(",") for extends_item in extends: - r = requests.get(extends_item, allow_redirects=True) - assert ( - r.status_code == 200 - ), f"Unable to retrieve EXTENDS config file {config_file_name}" - extends_config_data = yaml.safe_load(r.content) + if extends_item.startswith("http"): + r = requests.get(extends_item, allow_redirects=True) + assert ( + r.status_code == 200 + ), f"Unable to retrieve EXTENDS config file {config_file_name}" + extends_config_data = yaml.safe_load(r.content) + else: + extends_config_data = yaml.safe_load(extends_item) combined_config.update(extends_config_data) CONFIG_SOURCE += f"\n[config] - extends from: {extends_item}" combined_config.update(runtime_config) From 2becc144488d565007d87525ce12b58b48aff76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20Dom=C3=ADnguez?= Date: Tue, 20 Dec 2022 09:23:24 +0100 Subject: [PATCH 2/2] Open file --- megalinter/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/megalinter/config.py b/megalinter/config.py index b04609edec9..bca010cab3a 100644 --- a/megalinter/config.py +++ b/megalinter/config.py @@ -83,7 +83,8 @@ def init_config(workspace=None): ), f"Unable to retrieve EXTENDS config file {config_file_name}" extends_config_data = yaml.safe_load(r.content) else: - extends_config_data = yaml.safe_load(extends_item) + with open(extends_item, "r", encoding="utf-8") as f: + extends_config_data = yaml.safe_load(f) combined_config.update(extends_config_data) CONFIG_SOURCE += f"\n[config] - extends from: {extends_item}" combined_config.update(runtime_config)