From ee34e22cb97132289039e190810a81ca692a664a Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Mon, 18 Mar 2019 16:59:58 +0000
Subject: Use dotenv package

---
 app/config.py  | 22 ----------------------
 config.py      | 24 ++++++++++++++++++++++++
 poetry.lock    | 11 ++++++++++-
 pyproject.toml |  1 +
 4 files changed, 35 insertions(+), 23 deletions(-)
 delete mode 100644 app/config.py
 create mode 100644 config.py

diff --git a/app/config.py b/app/config.py
deleted file mode 100644
index 56e4910..0000000
--- a/app/config.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-
-# TODO: change these things to an instance path
-basedir = os.path.abspath(os.path.dirname(__file__))
-
-
-class Config(object):
-    SECRET_KEY = os.environ.get("SECRET_KEY") or "you-will-never-guess"
-
-    SQLALCHEMY_DATABASE_URI = os.environ.get(
-        "DATABASE_URL"
-    ) or "sqlite:///" + os.path.join(basedir, "app.db")
-    SQLALCHEMY_TRACK_MODIFICATIONS = False
-
-    MAIL_SERVER = os.environ.get('MAIL_SERVER')
-    MAIL_PORT = int(os.environ.get('MAIL_PORT') or 25)
-    MAIL_USE_TLS = os.environ.get('MAIL_USE_TLS') is not None
-    MAIL_USERNAME = os.environ.get('MAIL_USERNAME')
-    MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
-    ADMINS = ['gvandenburg@turing.ac.uk']
diff --git a/config.py b/config.py
new file mode 100644
index 0000000..32dd5ff
--- /dev/null
+++ b/config.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+import os
+
+from dotenv import load_dotenv
+
+# TODO: change these things to an instance path
+basedir = os.path.abspath(os.path.dirname(__file__))
+load_dotenv(os.path.join(basedir, '.env'))
+
+class Config(object):
+    SECRET_KEY = os.environ.get("SECRET_KEY") or "you-will-never-guess"
+
+    SQLALCHEMY_DATABASE_URI = os.environ.get(
+        "DATABASE_URL"
+    ) or "sqlite:///" + os.path.join(basedir, "app.db")
+    SQLALCHEMY_TRACK_MODIFICATIONS = False
+
+    MAIL_SERVER = os.environ.get('MAIL_SERVER')
+    MAIL_PORT = int(os.environ.get('MAIL_PORT') or 25)
+    MAIL_USE_TLS = os.environ.get('MAIL_USE_TLS') is not None
+    MAIL_USERNAME = os.environ.get('MAIL_USERNAME')
+    MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
+    ADMINS = ['gvandenburg@turing.ac.uk']
diff --git a/poetry.lock b/poetry.lock
index 8c363e0..614ef7b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -247,6 +247,14 @@ version = "2.8.0"
 [package.dependencies]
 six = ">=1.5"
 
+[[package]]
+category = "main"
+description = "Add .env support to your django/flask apps in development and deployments"
+name = "python-dotenv"
+optional = false
+python-versions = "*"
+version = "0.10.1"
+
 [[package]]
 category = "main"
 description = "Programmatically open an editor, capture the result."
@@ -296,7 +304,7 @@ python-versions = "*"
 version = "2.2.1"
 
 [metadata]
-content-hash = "402e59e5c5f6451d19d07c09e123a70dc68a3f4f7d698ef42f18fd521335e143"
+content-hash = "1d07bebef9272a897cac525c67e7c41a07c4263824389f272b41d46a21bd5a03"
 python-versions = "^3.7"
 
 [metadata.hashes]
@@ -324,6 +332,7 @@ py = ["64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", "dc639
 pyjwt = ["5c6eca3c2940464d106b99ba83b00c6add741c9becaec087fb7ccdefea71350e", "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"]
 pytest = ["3f193df1cfe1d1609d4c583838bea3d532b18d6160fd3f55c9447fdca30848ec", "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660"]
 python-dateutil = ["7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"]
+python-dotenv = ["a84569d0e00d178bc5b957f7ff208bf49287cbf61857c31c258c4a91f571527b", "c9b1ddd3cdbe75c7d462cb84674d87130f4b948f090f02c7d7144779afb99ae0"]
 python-editor = ["1bf6e860a8ad52a14c3ee1252d5dc25b2030618ed80c022598f00176adc8367d", "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b", "5f98b069316ea1c2ed3f67e7f5df6c0d8f10b689964a4a811ff64f0106819ec8", "c3da2053dbab6b29c94e43c486ff67206eafbe7eb52dbec7390b5e2fb05aac77", "ea87e17f6ec459e780e4221f295411462e0d0810858e055fc514684350a2f522"]
 six = ["3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"]
 sqlalchemy = ["781fb7b9d194ed3fc596b8f0dd4623ff160e3e825dd8c15472376a438c19598b"]
diff --git a/pyproject.toml b/pyproject.toml
index f706bcd..7e927e1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,6 +14,7 @@ flask-login = "^0.4.1"
 flask-mail = "^0.9.1"
 pyjwt = "^1.7"
 flask-bootstrap = "^3.3"
+python-dotenv = "^0.10.1"
 
 [tool.poetry.dev-dependencies]
 pytest = "^3.0"
-- 
cgit v1.2.3