Skip to content

Commit 394052f

Browse files
fix: refactor environment loading
1 parent 3ff74f7 commit 394052f

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.venv
22
__pycache__
33

4-
.env
4+
.env.local
55

66
data/
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
import logging
2+
import os
23
import time
34

5+
from dotenv import find_dotenv, load_dotenv
6+
47
logging.basicConfig(
58
level=logging.INFO,
69
format="%(asctime)s:%(levelname)s:%(name)s:%(message)s",
710
datefmt="%Y-%m-%dT%H:%M:%S",
811
)
912
logging.Formatter.converter = time.gmtime
13+
14+
logger = logging.getLogger(__name__)
15+
16+
APP_ENV = os.environ.get("APP_ENV", "local")
17+
logger.info(f"Loading {APP_ENV} environment variables")
18+
load_dotenv(find_dotenv(f".env.{APP_ENV}"))

oc4ids_datastore_pipeline/pipeline.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import flattentool
99
import requests
10-
from dotenv import load_dotenv
1110
from libcoveoc4ids.api import oc4ids_json_output
1211

1312
from oc4ids_datastore_pipeline.database import (
@@ -149,5 +148,4 @@ def process_registry() -> None:
149148

150149

151150
def run() -> None:
152-
load_dotenv()
153151
process_registry()

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from dotenv import find_dotenv, load_dotenv
1+
import os
22

3-
load_dotenv(find_dotenv(".env.test"))
3+
os.environ["APP_ENV"] = "test"

0 commit comments

Comments
 (0)