From 807e554aafa598044099d6f1c695cda8b9501ba4 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Mon, 12 Nov 2018 23:21:19 -0800
Subject: remove sqlite cruft

---
 python/fatcat_web/__init__.py |  2 +-
 python/fatcat_webface.py      | 16 +---------------
 python/web_config.py          | 17 +++++++++++++++++
 python/webface_config.py      | 20 --------------------
 4 files changed, 19 insertions(+), 36 deletions(-)
 create mode 100644 python/web_config.py
 delete mode 100644 python/webface_config.py

(limited to 'python')

diff --git a/python/fatcat_web/__init__.py b/python/fatcat_web/__init__.py
index aa12f972..0033f4a3 100644
--- a/python/fatcat_web/__init__.py
+++ b/python/fatcat_web/__init__.py
@@ -2,7 +2,7 @@
 from flask import Flask
 from flask_uuid import FlaskUUID
 from flask_debugtoolbar import DebugToolbarExtension
-from config import Config
+from webface_config import Config
 import fatcat_client
 
 toolbar = DebugToolbarExtension()
diff --git a/python/fatcat_webface.py b/python/fatcat_webface.py
index cfddad48..76cebfe9 100755
--- a/python/fatcat_webface.py
+++ b/python/fatcat_webface.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import argparse
-from fatcat import app
+from fatcat_webface import app
 
 def main():
     parser = argparse.ArgumentParser()
@@ -15,22 +15,8 @@ def main():
         type=int,
         default=9810,
         help="listen on this port")
-    parser.add_argument('--database-uri',
-        default=app.config['SQLALCHEMY_DATABASE_URI'],
-        help="sqlalchemy database string")
-    parser.add_argument('--init-db',
-        action='store_true',
-        help="create database tables and insert dummy data")
     args = parser.parse_args()
 
-    app.config['SQLALCHEMY_DATABASE_URI'] = args.database_uri
-
-    if args.init_db:
-        db.create_all()
-        fatcat.sql.populate_db()
-        print("Dummy database configured: " + app.config['SQLALCHEMY_DATABASE_URI'])
-        return
-
     app.run(debug=args.debug, host=args.host, port=args.port)
 
 if __name__ == '__main__':
diff --git a/python/web_config.py b/python/web_config.py
new file mode 100644
index 00000000..c213e59f
--- /dev/null
+++ b/python/web_config.py
@@ -0,0 +1,17 @@
+
+import os
+import subprocess
+
+basedir = os.path.abspath(os.path.dirname(__file__))
+
+class Config(object):
+    GIT_REVISION = subprocess.check_output(["git", "describe", "--always"]).strip()
+    # This is, effectively, the QA/PROD flag
+    FATCAT_DOMAIN = "qa.fatcat.wiki"
+    ELASTIC_BACKEND = "https://search.fatcat.wiki"
+    ELASTIC_INDEX = "fatcat"
+
+    # "Event more verbose" debug options. SECRET_KEY is bogus.
+    #SQLALCHEMY_ECHO = True
+    #SECRET_KEY = "kuhy0284hflskjhg01284"
+    #DEBUG = True
diff --git a/python/webface_config.py b/python/webface_config.py
deleted file mode 100644
index 3d6db049..00000000
--- a/python/webface_config.py
+++ /dev/null
@@ -1,20 +0,0 @@
-
-import os
-import subprocess
-
-basedir = os.path.abspath(os.path.dirname(__file__))
-
-class Config(object):
-    SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URI') or \
-        'sqlite:///' + os.path.join(basedir, 'fatcat_dev.sqlite')
-    SQLALCHEMY_TRACK_MODIFICATIONS = False
-    GIT_REVISION = subprocess.check_output(["git", "describe", "--always"]).strip()
-    # This is, effectively, the QA/PROD flag
-    FATCAT_DOMAIN = "qa.fatcat.wiki"
-    ELASTIC_BACKEND = "https://search.fatcat.wiki"
-    ELASTIC_INDEX = "fatcat"
-
-    # "Event more verbose" debug options. SECRET_KEY is bogus.
-    #SQLALCHEMY_ECHO = True
-    #SECRET_KEY = "kuhy0284hflskjhg01284"
-    #DEBUG = True
-- 
cgit v1.2.3