Remove tornado cruft from app.py

atst/app.py

@@ -1,12 +1,9 @@
 import os
 import re
 from configparser import ConfigParser
-from redis import StrictRedis
+from flask import Flask, request, g
-from flask import Flask, request, g, session
 from unipath import Path
 
-from atst.api_client import ApiClient
-from atst.sessions import RedisSessions
 from atst.database import db
 from atst.assets import assets
 
@@ -65,155 +62,6 @@ def make_flask_callbacks(app):
             return self.render_string("components/modal.html.to", body=body)
 
 
-# def make_app(config, deps, **kwargs):
-#     routes = [
-#         url(r"/", Root, {"page": "root"}, name="root"),
-#         url(
-#             r"/login-redirect",
-#             LoginRedirect,
-#             {
-#                 "sessions": deps["sessions"],
-#                 "authnid_client": deps["authnid_client"],
-#                 "db_session": deps["db_session"],
-#             },
-#             name="login_redirect",
-#         ),
-#         url(r"/home", Main, {"page": "home"}, name="home"),
-#         url(r"/styleguide", Main, {"page": "styleguide"}, name="styleguide"),
-#         url(
-#             r"/workspaces/blank",
-#             Main,
-#             {"page": "workspaces_blank"},
-#             name="workspaces_blank",
-#         ),
-#         url(
-#             r"/workspaces",
-#             Workspaces,
-#             {"page": "workspaces", "db_session": deps["db_session"]},
-#             name="workspaces",
-#         ),
-#         url(
-#             r"/requests",
-#             Request,
-#             {"page": "requests", "db_session": deps["db_session"]},
-#             name="requests",
-#         ),
-#         url(
-#             r"/requests/new",
-#             RequestNew,
-#             {
-#                 "page": "requests_new",
-#                 "db_session": deps["db_session"],
-#             },
-#             name="request_new",
-#         ),
-#         url(
-#             r"/requests/new/([0-9])",
-#             RequestNew,
-#             {
-#                 "page": "requests_new",
-#                 "db_session": deps["db_session"],
-#             },
-#             name="request_form_new",
-#         ),
-#         url(
-#             r"/requests/new/([0-9])/(\S+)",
-#             RequestNew,
-#             {
-#                 "page": "requests_new",
-#                 "db_session": deps["db_session"],
-#             },
-#             name="request_form_update",
-#         ),
-#         url(
-#             r"/requests/submit/(\S+)",
-#             RequestsSubmit,
-#             {"db_session": deps["db_session"]},
-#             name="requests_submit",
-#         ),
-#         # Dummy request/approval screen
-#         url(
-#             r"/request/approval",
-#             Main,
-#             {"page": "request_approval"},
-#             name="request_approval",
-#         ),
-#         url(
-#             r"/requests/verify/(\S+)",
-#             RequestFinancialVerification,
-#             {
-#                 "page": "financial_verification",
-#                 "db_session": deps["db_session"],
-#             },
-#             name="financial_verification",
-#         ),
-#         url(
-#             r"/requests/financial_verification_submitted",
-#             Main,
-#             {"page": "requests/financial_verification_submitted"},
-#             name="financial_verification_submitted",
-#         ),
-#         url(r"/users", Main, {"page": "users"}, name="users"),
-#         url(r"/reports", Main, {"page": "reports"}, name="reports"),
-#         url(r"/calculator", Main, {"page": "calculator"}, name="calculator"),
-#         url(
-#             r"/workspaces/(\S+)/members", WorkspaceMembers, {}, name="workspace_members"
-#         ),
-#         url(r"/workspaces/(\S+)/projects", Workspace, {}, name="workspace_projects"),
-#         url(r"/workspaces/123456/projects/789/edit", Main, {"page": "project_edit"}, name="project_edit"),
-#         url(r"/workspaces/123456/members/789/edit", Main, {"page": "member_edit"}, name="member_edit"),
-#     ]
-
-#     if not ENV == "production":
-#         routes += [
-#             url(
-#                 r"/login-dev",
-#                 Dev,
-#                 {
-#                     "action": "login",
-#                     "sessions": deps["sessions"],
-#                     "db_session": deps["db_session"],
-#                 },
-#                 name="dev-login",
-#             )
-#         ]
-
-#     app = tornado.web.Application(
-#         routes,
-#         login_url="/",
-#         template_path=home.child("templates"),
-#         static_path=home.child("static"),
-#         cookie_secret=config["default"]["COOKIE_SECRET"],
-#         debug=config["default"].getboolean("DEBUG"),
-#         ui_modules=ui_modules,
-#         ui_methods=ui_methods,
-#         **kwargs
-#     )
-#     app.config = config
-#     app.sessions = deps["sessions"]
-#     return app
-
-
-def make_deps(config):
-    # we do not want to do SSL verify services in test and development
-    validate_cert = ENV == "production"
-    redis_client = StrictRedis.from_url(
-        config["default"]["REDIS_URI"], decode_responses=True
-    )
-
-    return {
-        "db_session": make_db(config),
-        "authnid_client": ApiClient(
-            config["default"]["AUTHNID_BASE_URL"],
-            api_version="v1",
-            validate_cert=validate_cert,
-        ),
-        "sessions": RedisSessions(
-            redis_client, config["default"]["SESSION_TTL_SECONDS"]
-        ),
-    }
-
-
 def map_config(config):
     return {
         "ENV": config["default"]["ENVIRONMENT"],