From 1fa5e0f9a33ef5e438124d9a0b1715935f67ba61 Mon Sep 17 00:00:00 2001 From: MarcoHuebner <57489799+MarcoHuebner@users.noreply.github.com> Date: Sun, 4 Sep 2022 17:24:47 +0200 Subject: [PATCH] Fixed missing config dict error (in remote CI/CD) by mocking it, moved load_config into function, #45 --- src/pygenesis/cache.py | 4 +--- src/pygenesis/data.py | 2 +- src/pygenesis/http_helper.py | 10 ++++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pygenesis/cache.py b/src/pygenesis/cache.py index de35099..6aaa2ed 100644 --- a/src/pygenesis/cache.py +++ b/src/pygenesis/cache.py @@ -73,9 +73,7 @@ def clean_cache(file: Optional[str] = None) -> None: cache_dir = Path(config["DATA"]["cache_dir"]) except KeyError as e: logger.critical( - "Cache dir does not exist! Please make sure init_config() was run properly. \ - Path: %s, Error: %s", - cache_dir, + "Cache dir does not exist! Please make sure init_config() was run properly. Error: %s", e, ) diff --git a/src/pygenesis/data.py b/src/pygenesis/data.py index a5211df..cf99938 100644 --- a/src/pygenesis/data.py +++ b/src/pygenesis/data.py @@ -38,7 +38,7 @@ def get_data( if method == "tablefile": params["format"] = "ffcsv" - params |= kwargs + params.update(kwargs) response = get_response_from_endpoint("data", method, params) data = response.text diff --git a/src/pygenesis/http_helper.py b/src/pygenesis/http_helper.py index 4bcd9de..91c76df 100644 --- a/src/pygenesis/http_helper.py +++ b/src/pygenesis/http_helper.py @@ -28,10 +28,12 @@ def get_response_from_endpoint( config = load_config() url = f"{config['GENESIS API']['base_url']}{endpoint}/{method}" - params |= { - "username": config["GENESIS API"]["username"], - "password": config["GENESIS API"]["password"], - } + params.update( + { + "username": config["GENESIS API"]["username"], + "password": config["GENESIS API"]["password"], + } + ) response = requests.get(url, params=params)