From b1344dd41424c557f92f8ebe6186ba2b002f52f0 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Thu, 28 Mar 2019 01:50:35 +0100
Subject: [PATCH] ENH: add "PYCAOSDBINI" envvar
---
src/caosdb/__init__.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/caosdb/__init__.py b/src/caosdb/__init__.py
index cc5b3f9b..69f8f24e 100644
--- a/src/caosdb/__init__.py
+++ b/src/caosdb/__init__.py
@@ -24,7 +24,7 @@
# Import of the connection function (which is used to connect to the DB):
from os.path import expanduser, join
-from os import getcwd
+from os import getcwd, environ
from caosdb.configuration import configure, get_config
from caosdb.common import administration
@@ -44,5 +44,8 @@ from caosdb.common.models import (delete, execute_query, raise_errors,
import caosdb.apiutils
# read configuration these files
-configure(expanduser('~/.pycaosdb.ini'))
+if "PYCAOSDBINI" in environ:
+ configure(expanduser(environ["PYCAOSDBINI"]))
+else:
+ configure(expanduser('~/.pycaosdb.ini'))
configure(join(getcwd(), "pycaosdb.ini"))
--
GitLab