From 13c5fba7017b3509ad2ca4008831bb3444438eab Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 7 Sep 2021 17:53:01 +0200 Subject: [PATCH 1/3] Fix handling of releaser config in multiple files --- jupyter_releaser/util.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jupyter_releaser/util.py b/jupyter_releaser/util.py index 68eb2569..dab68fa7 100644 --- a/jupyter_releaser/util.py +++ b/jupyter_releaser/util.py @@ -275,17 +275,20 @@ def read_config(): if JUPYTER_RELEASER_CONFIG.exists(): config = toml.loads(JUPYTER_RELEASER_CONFIG.read_text(encoding="utf-8")) - elif PYPROJECT.exists(): + if not config and PYPROJECT.exists(): data = toml.loads(PYPROJECT.read_text(encoding="utf-8")) - config = data.get("tool", {}).get("jupyter-releaser") or {} + pyproject_config = data.get("tool", {}).get("jupyter-releaser") + if pyproject_config: + config = pyproject_config - elif PACKAGE_JSON.exists(): + if not config and PACKAGE_JSON.exists(): data = json.loads(PACKAGE_JSON.read_text(encoding="utf-8")) if "jupyter-releaser" in data: config = data["jupyter-releaser"] with open(osp.join(HERE, "schema.json")) as fid: schema = json.load(fid) + validator = Validator(schema) validator.validate(config) return config From e3becf613e5a6b63a59fc9733fccfd01233d8ff9 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 7 Sep 2021 17:54:33 +0200 Subject: [PATCH 2/3] Default to None --- jupyter_releaser/util.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jupyter_releaser/util.py b/jupyter_releaser/util.py index dab68fa7..5f02e01c 100644 --- a/jupyter_releaser/util.py +++ b/jupyter_releaser/util.py @@ -271,7 +271,8 @@ def retry(cmd, **kwargs): def read_config(): """Read the jupyter-releaser config data""" - config = {} + config = None + if JUPYTER_RELEASER_CONFIG.exists(): config = toml.loads(JUPYTER_RELEASER_CONFIG.read_text(encoding="utf-8")) @@ -286,6 +287,7 @@ def read_config(): if "jupyter-releaser" in data: config = data["jupyter-releaser"] + config = config or {} with open(osp.join(HERE, "schema.json")) as fid: schema = json.load(fid) From 0ca001f0294c3557788a8afd556e0540267254c8 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 7 Sep 2021 17:56:26 +0200 Subject: [PATCH 3/3] Move config default below --- jupyter_releaser/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyter_releaser/util.py b/jupyter_releaser/util.py index 5f02e01c..649df01c 100644 --- a/jupyter_releaser/util.py +++ b/jupyter_releaser/util.py @@ -287,10 +287,10 @@ def read_config(): if "jupyter-releaser" in data: config = data["jupyter-releaser"] - config = config or {} with open(osp.join(HERE, "schema.json")) as fid: schema = json.load(fid) + config = config or {} validator = Validator(schema) validator.validate(config) return config