Merge branch 'master' of github.com:ZeusWPI/Blokdata

blokdata/app.py

@@ -1,4 +1,4 @@
-from sheet_data import google_sheet_to_json
+from .sheet_data import google_sheet_to_json
 
 from flask import Flask
 from flask_cors import CORS, cross_origin

passenger_wsgi.py

@@ -0,0 +1,13 @@
+import os
+import sys
+
+INTERP = os.path.expanduser("~/venv/bin/python3")
+if sys.executable != INTERP:
+    os.execl(INTERP, INTERP, *sys.argv)
+
+sys.path.append(os.getcwd())
+from blokdata.app import app as application
+
+# For running on the server with passenger etc
+if __name__ == "__main__":
+    application.run()