Skip to content

Commit eda084f

Browse files
author
{sabine.maennel}
committed
fix(dotenv loading): load form file not from local environment
replace `load_dotenv` by `dotenv_values` as the former function loads the local environment variables, but what we need is that the variables are loaded from the `.env` file
1 parent 1cbbb37 commit eda084f

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

odtp/setup.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
from .storage import s3Manager
66

77
import logging
8-
import os
9-
from dotenv import load_dotenv
8+
from dotenv import dotenv_values
9+
10+
11+
config = dotenv_values(".env")
1012

1113

1214
class odtpDatabase:
1315
def __init__(self):
14-
load_dotenv()
1516

16-
url = os.getenv("ODTP_MONGO_SERVER")
17+
url = config["ODTP_MONGO_SERVER"]
1718
db_name = "odtp"
1819
dbManager = MongoManager(url, db_name)
1920

@@ -58,11 +59,10 @@ def close(self):
5859

5960
class s3Database:
6061
def __init__(self):
61-
load_dotenv()
62-
s3Server = os.getenv("ODTP_S3_SERVER")
63-
bucketName = os.getenv("ODTP_BUCKET_NAME")
64-
accessKey = os.getenv("ODTP_ACCESS_KEY")
65-
secretKey = os.getenv("ODTP_SECRET_KEY")
62+
s3Server = config["ODTP_S3_SERVER"]
63+
bucketName = config["ODTP_BUCKET_NAME"]
64+
accessKey = config["ODTP_ACCESS_KEY"]
65+
secretKey = config["ODTP_SECRET_KEY"]
6666

6767
storageManager = s3Manager(s3Server, bucketName, accessKey, secretKey)
6868

tests/test_db.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
import logging
1010
from odtp import db
1111

12-
from dotenv import load_dotenv
13-
import os
12+
from dotenv import dotenv_values
13+
14+
15+
config = dotenv_values(".env")
1416

1517
# # Set up logging
1618
# logging.basicConfig(level=logging.DEBUG)
@@ -38,9 +40,7 @@ def setUp(self):
3840
logging.basicConfig(level=logging.DEBUG)
3941
self.logger = logging.getLogger(__name__)
4042

41-
load_dotenv()
42-
43-
url = os.getenv("MONGOURL")
43+
url = config["MONGOURL"]
4444
db_name = "odtp"
4545
dbManager = db.MongoManager(url, db_name)
4646

0 commit comments

Comments
 (0)