From e603d360b091b012b1b7c614b3622cb4015712ec Mon Sep 17 00:00:00 2001 From: Tonio Fincke Date: Wed, 12 Apr 2023 10:56:57 +0200 Subject: [PATCH 1/3] allow default data path to be read from environment variable --- cate/conf/defaults.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cate/conf/defaults.py b/cate/conf/defaults.py index 1f52d223..e23c7a55 100644 --- a/cate/conf/defaults.py +++ b/cate/conf/defaults.py @@ -28,7 +28,8 @@ CATE_LOCAL_DIR_NAME = 'cate-local' DEFAULT_DATA_DIR_NAME = '.cate' -DEFAULT_DATA_PATH = os.path.join(os.path.expanduser('~'), DEFAULT_DATA_DIR_NAME) +DEFAULT_DATA_PATH = os.environ.get('CATE_DEFAULT_DATA_PATH', + os.path.join(os.path.expanduser('~'), DEFAULT_DATA_DIR_NAME)) DEFAULT_VERSION_DATA_PATH = os.path.join(DEFAULT_DATA_PATH, __version__) GLOBAL_CONF_FILE = os.path.join(DEFAULT_DATA_PATH, 'conf.py') From ed0fcd6c11a91fa2f2d6fae9c2263f0c9ee771e3 Mon Sep 17 00:00:00 2001 From: Tonio Fincke Date: Wed, 12 Apr 2023 17:25:54 +0200 Subject: [PATCH 2/3] changed environment variable name --- cate/conf/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cate/conf/defaults.py b/cate/conf/defaults.py index e23c7a55..707e38d9 100644 --- a/cate/conf/defaults.py +++ b/cate/conf/defaults.py @@ -28,7 +28,7 @@ CATE_LOCAL_DIR_NAME = 'cate-local' DEFAULT_DATA_DIR_NAME = '.cate' -DEFAULT_DATA_PATH = os.environ.get('CATE_DEFAULT_DATA_PATH', +DEFAULT_DATA_PATH = os.environ.get('CATE_DATA_PATH', os.path.join(os.path.expanduser('~'), DEFAULT_DATA_DIR_NAME)) DEFAULT_VERSION_DATA_PATH = os.path.join(DEFAULT_DATA_PATH, __version__) From ce8dbbfe1999a0dc1a9a83c1af381b53929409f6 Mon Sep 17 00:00:00 2001 From: Tonio Fincke Date: Wed, 12 Apr 2023 17:28:42 +0200 Subject: [PATCH 3/3] edited changelog --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index be3eb421..5ba6e9cc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,9 @@ * Removed the `cate upd` CLI command. +* Added support of environment variable `CATE_DATA_PATH` to set path where to + find basic cate configuration files. + ## Version 3.1.6 * Fixed docker image