dotenv fixes

douwevandermeij · Jul 11, 2021 · 0683d64 · 0683d64
1 parent 20a47ef
commit 0683d64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/fractal/__init__.py b/fractal/__init__.py
@@ -1,6 +1,6 @@
 """Fractal is a scaffolding toolkit for building SOLID logic for your Python applications."""
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 
 from abc import ABC
 

diff --git a/fractal/core/utils/settings.py b/fractal/core/utils/settings.py
@@ -1,3 +1,4 @@
+import os
 from io import StringIO
 
 from dotenv import load_dotenv
@@ -10,7 +11,10 @@ def __new__(cls, dotenv=True, *args, **kwargs):
         if not isinstance(cls.instance, cls):
             cls.instance = object.__new__(cls, *args, **kwargs)
             if dotenv:
-                load_dotenv()
+                dotenv_path = None
+                if root_dir := getattr(cls, "ROOT_DIR", None):
+                    dotenv_path = os.path.join(root_dir, ".env")
+                load_dotenv(dotenv_path)
             cls.instance.load()
         return cls.instance